Updates to get Rubicon downloads and build products in the right place.

freakboy3742 · freakboy3742 · commit 434d1a2430d7 · 2014-09-27T11:37:11.000+08:00
diff --git a/build.sh b/build.sh
@@ -348,9 +348,7 @@ function run_prepare() {
 
 	info "Distribution will be located at $DIST_PATH"
 	if [ -e "$DIST_PATH" ]; then
-		error "The distribution $DIST_PATH already exist"
-		error "Press a key to remove it, or Control + C to abort."
-		read
+		info "Removing existing distribution"
 		try rm -rf "$DIST_PATH"
 	fi
 	try mkdir -p "$DIST_PATH"
@@ -531,6 +529,13 @@ function run_get_packages() {
 		fi
 
 		filename=$(basename $url)
+		debug "Initial filename is $filename"
+		if [ "X$filename" == "Xmaster.zip" ]; then
+			debug "Github master file found"
+			filename="$module-$filename"
+		fi
+		debug "Final filename is $filename"
+
 		marker_filename=".mark-$filename"
 		do_download=1
 
@@ -581,6 +586,10 @@ function run_get_packages() {
 			info "Downloading $url"
 			try rm -f $marker_filename
 			try $WGET $filename $url
+			if [ "X$(basename $url)" != "$filename" ]; then
+				debug "Move downloaded file to final location"
+				mv $(basename $url) $filename
+			fi
 			touch $marker_filename
 		else
 			debug "Module $module already downloaded"
diff --git a/recipes/rubicon/recipe.sh b/recipes/rubicon/recipe.sh
@@ -13,7 +13,7 @@ URL_rubicon=https://github.com/pybee/rubicon-java/archive/master.zip
 MD5_rubicon=
 
 # default build path
-BUILD_rubicon=$BUILD_PATH/rubicon/$(get_directory $URL_rubicon)
+BUILD_rubicon=$BUILD_PATH/rubicon/rubicon-master
 
 # default recipe path
 RECIPE_rubicon=$RECIPES_PATH/rubicon
@@ -33,7 +33,8 @@ function build_rubicon() {
     # try $HOSTPYTHON setup.py install
 
     # Build Java JARs
-    # make libs/rubicon.jar
+    make dist/rubicon.jar
+    cp dist/rubicon.jar $LIBS_PATH
 
     # Build JNI component
 
