Fixes to build_release.sh script

bin/build_modules.sh

@@ -1,25 +1,32 @@
 #!/bin/bash
 
-LEIN=`which lein2 || which lein` 
+set -e  # die if anything bad happens
+
+function banner {
+  echo ; echo "------------- $1 ---------------" ; echo
+}
+
+LEIN=`which lein2 || which lein`
 export LEIN_ROOT=1
 
 
 for module in $(cat MODULES)
 do
-	echo "Building $module"
-	cd $module
-	if [ $module != "storm-console-logging" ]
-		then
-			rm ../conf/logback.xml
-	fi
-
+  banner "Building $module"
+  cd $module
+  if [ $module != "storm-console-logging" ]
+  then
+    rm -f ../conf/logback.xml
+  else
+    git checkout ../conf/logback.xml ; true
+  fi
 
-	$LEIN with-profile release clean
-	$LEIN with-profile release deps
-	$LEIN with-profile release jar
-	$LEIN with-profile release install
-	$LEIN with-profile release pom
+  $LEIN with-profile release clean
+  $LEIN with-profile release deps
+  $LEIN with-profile release jar
+  $LEIN with-profile release install
+  $LEIN with-profile release pom
 
-	git checkout ../conf/logback.xml
-	cd ..
-done
+  git checkout ../conf/logback.xml ; true
+  cd ..
+done

bin/build_release.sh

@@ -1,62 +1,87 @@
 #!/bin/bash
 function quit {
-    exit 1
+  exit 1
+}
+trap quit 1 2 3 15  # Ctrl+C exits.
+
+function banner {
+  echo ; echo "=========================" ; echo "==" ; echo "== $1" ; echo "==" ; echo
 }
-trap quit 1 2 3 15  #Ctrl+C exits.
 
 RELEASE=`cat VERSION`
-LEIN=`which lein2 || which lein` 
+LEIN=`which lein2 || which lein`
 export LEIN_ROOT=1
 
-echo Making release $RELEASE
+# ==========================================================================
+banner "Making release $RELEASE"
 
-DIR=`pwd`/_release/storm-$RELEASE
+CODE_ROOT=`pwd`
+DIR="$CODE_ROOT/_release/storm-$RELEASE"
+ZIPFILE="$CODE_ROOT/storm-$RELEASE.zip"
 
-rm -rf _release
-rm -f *.zip 
+rm -rf "$DIR"
+rm -f  "$ZIPFILE"
 $LEIN pom || exit 1
-mkdir -p $DIR/lib
+mkdir -p "$DIR/lib"
+
+# ==========================================================================
+banner "Building submodules"
 
+/bin/bash "$CODE_ROOT/bin/build_modules.sh" || exit 1
 
-sh bin/build_modules.sh
+# ==========================================================================
+banner "Gathering dependencies"
 
 for module in $(cat MODULES)
 do
-	cd $module
-	mvn dependency:copy-dependencies || exit 1
-	cp -f target/dependency/*.jar $DIR/lib/
-	cp -f target/*.jar $DIR/
-	cd ..
+  cd "$CODE_ROOT/$module"
+  mvn dependency:copy-dependencies || exit 1
+  cp -f target/dependency/*.jar "$DIR/lib/"
+  cp -f target/*.jar "$DIR/"
+  cd "$CODE_ROOT"
 done
 
-cd _release/storm-$RELEASE
-for i in *.jar
+# The netty libs have storm itself as a dependency; remove any jar in $DIR/lib/ that is in $DIR/
+cd "$DIR"
+for base_jar in *.jar
 do
-	rm -f lib/$i
-done 
-cd ../..
+  rm -f lib/$base_jar
+done
+cd "$CODE_ROOT"
+
+# ==========================================================================
+banner "Copying support files"
+
+cp -v CHANGELOG.md "$DIR/"
 
-cp CHANGELOG.md $DIR/
+echo $RELEASE > "$DIR/RELEASE"
 
-echo $RELEASE > $DIR/RELEASE
+mkdir -p "$DIR/logback"
+mkdir -p "$DIR/logs"
+cp -vR logback/cluster.xml "$DIR/logback/cluster.xml"
 
-mkdir -p $DIR/logback
-mkdir -p $DIR/logs
-cp -R logback/cluster.xml $DIR/logback/cluster.xml
+mkdir "$DIR/conf"
+cp -v conf/storm.yaml.example "$DIR/conf/storm.yaml"
 
-mkdir $DIR/conf
-cp conf/storm.yaml.example $DIR/conf/storm.yaml
+cp -vR storm-core/src/ui/public "$DIR/"
 
-cp -R storm-core/src/ui/public $DIR/
+cp -vRp bin "$DIR/"
+rm "$DIR"/bin/build_{release,modules}.sh
 
-cp -R bin $DIR/
+cp -v README.markdown "$DIR/"
+cp -v LICENSE.html "$DIR/"
 
-cp README.markdown $DIR/
-cp LICENSE.html $DIR/
+# ==========================================================================
+banner "Building Zip File in '$ZIPFILE'"
 
-cd _release
-zip -r storm-$RELEASE.zip *
-cd ..
-mv _release/storm-*.zip .
-rm -rf _release
+cd "$CODE_ROOT/_release"
+zip -r "$ZIPFILE" *
+cd "$CODE_ROOT"
+echo
 
+if [ "$STORM_KEEP_RELEASE" == "true" ] ; then
+  echo "keeping _release dir '$DIR'"
+else
+  echo "removing _release dir"
+  rm -rf "$DIR"
+fi

bin/storm

@@ -39,6 +39,7 @@ if not os.path.exists(STORM_DIR + "/RELEASE"):
     print "******************************************"
     print "The storm client can only be run from within a release. You appear to be trying to run the client from a checkout of Storm's source code."
     print "\nYou can download a Storm release at https://github.com/nathanmarz/storm/downloads"
+    print "\nor build it yourself by running ./bin/build_release.sh from a clone of the source repo."
     print "******************************************"
     sys.exit(1)  
 

storm-console-logging/project.clj

@@ -2,9 +2,11 @@
 (def VERSION (-> ROOT-DIR (str "/../VERSION") slurp (.trim)))
 
 (defproject storm/storm-console-logging VERSION
+  :dependencies [[org.clojure/clojure "1.4.0"]
+                ]
   :resource-paths ["logback"]
 
-  :profiles {:release {}
+  :profiles {
+             :release { :target-path "target" }
              }
-
   :aot :all)

storm-core/project.clj

@@ -36,7 +36,7 @@
 
   :profiles {:dev {:resource-paths ["src/dev"]
                    :dependencies [[org.mockito/mockito-all "1.9.5"]]}
-             :release {}
+             :release { :target-path "target" }
              :lib {}
              }
 

storm-netty/project.clj

@@ -6,6 +6,8 @@
                  [io.netty/netty "3.6.3.Final"]]
   :java-source-paths ["src/jvm"]
   :test-paths ["test/clj"]
-  :profiles {:release {}}
+  :profiles {
+             :release { :target-path "target" }
+	     }
   :jvm-opts ["-Djava.library.path=/usr/local/lib:/opt/local/lib:/usr/lib"]
   :aot :all))