Fix build break resulting from rearranging R and h2o builds.

nagyistoce · Aug 27, 2013 · 905835b · 905835b
1 parent 1cbf9ee
commit 905835b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ build:
 	$(MAKE) package
 
 build_h2o:
-	(export PROJECT_VERSION=$(PROJECT_VERSION); ./build.sh doc)
+	(export PROJECT_VERSION=$(PROJECT_VERSION); ./build.sh noclean doc)
 
 package:
 	rm -fr target/h2o-$(PROJECT_VERSION)

diff --git a/build.sh b/build.sh
@@ -182,7 +182,11 @@ function junit() {
     "$JAVA" -ea -cp ${JAR_FILE} water.Boot -mainClass water.JUnitRunner
 }
 
-clean
+if [ "$1" = "noclean" ]; then
+    shift
+else
+    clean
+fi
 if [ "$1" = "clean" ]; then exit 0; fi
 build_classes
 if [ "$1" = "compile" ]; then exit 0; fi