added diehard to list of externals for zipr+heaprand.

build-all.sh

@@ -28,17 +28,24 @@ if [ `uname -m` = 'x86_64' ]; then
 	# build 32-bit strata
 	if [ ! -d $STRATA_HOME32 ] ; then 
 		cd $STRATA
-		make clean distclean
+		if [ -f Makefile ] ; then
+			make clean distclean
+		fi
 		cd $PEASOUP_UMBRELLA_DIR
 		echo Creating strata 32-bit build directory
 		cp -R $STRATA $STRATA32
 	fi
+	
 	cd $STRATA_HOME32
 	STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux $cfar_mode || exit
 
 	# build x86-64 strata
 	cd $STRATA_HOME
-	./configure $cfar_mode || exit
+	if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then
+		echo Skipping Strata reconfigure step
+	else
+		./configure $cfar_mode || exit
+	fi
 	make || exit
 
 else
@@ -92,3 +99,13 @@ scons || exit
 
 cd $IRDB_TRANSFORMS
 scons || exit
+
+
+
+if [ `basename $BUILD_LOC` == "cfar_umbrella" ]; then
+	mkdir -p lib
+	cd DieHard/src
+	make linux-gcc-x86-64
+	cd $PEASOUP_UMBRELLA_DIR
+	cp DieHard/src/libdiehard.so lib
+fi

clean-all.sh

@@ -14,9 +14,13 @@ fi
 cd $PEASOUP_UMBRELLA_DIR/stratafier
 make clean
 
+# clean main strata
 cd $STRATA_HOME
 ./configure
 make clean
+rm Makefile
+
+# clean strata32 if exists.
 cd $PEASOUP_UMBRELLA_DIR/
 rm -Rf strata32
 

svn.externals.uva_dev

-diablo_toolchain     http://svn.zephyr-software.com/repos/diablo_toolchain/trunk/
-idaproCur            http://svn.zephyr-software.com/repos/idaproCur/trunk/
-idaproCur_sdk        http://svn.zephyr-software.com/repos/idaproCur_sdk/trunk/
-strata               http://svn.zephyr-software.com/repos/strata/trunk/
-peasoup_examples     http://svn.zephyr-software.com/repos/peasoup_examples/trunk/
-security_transforms  http://svn.zephyr-software.com/repos/security_transforms/trunk/
-irdb_transforms      http://svn.zephyr-software.com/repos/irdb_transforms/trunk/
-SMPStaticAnalyzer    http://svn.zephyr-software.com/repos/SMPStaticAnalyzer/trunk/
-stratafier           http://svn.zephyr-software.com/repos/stratafier/trunk/
-zipr                 http://svn.zephyr-software.com/repos/zipr/trunk/
-zipr_install         http://svn.zephyr-software.com/repos/zipr_install/trunk/
-zipr_callbacks       http://svn.zephyr-software.com/repos/zipr_callbacks/trunk/
-zipr_sdk             http://svn.zephyr-software.com/repos/zipr_sdk/trunk/
-zipr_scfi_plugin     http://svn.zephyr-software.com/repos/zipr_scfi_plugin/trunk
-zipr_large_only_plugin     http://svn.zephyr-software.com/repos/zipr_large_only_plugin/trunk
-zipr_push64_reloc_plugin     http://svn.zephyr-software.com/repos/zipr_push64_reloc_plugin/trunk
-IdaProServer         http://svn.zephyr-software.com/repos/IdaProServer/trunk/
+diablo_toolchain		http://svn.zephyr-software.com/repos/diablo_toolchain/trunk/
+idaproCur            		http://svn.zephyr-software.com/repos/idaproCur/trunk/
+idaproCur_sdk        		http://svn.zephyr-software.com/repos/idaproCur_sdk/trunk/
+strata               		http://svn.zephyr-software.com/repos/strata/trunk/
+peasoup_examples     		http://svn.zephyr-software.com/repos/peasoup_examples/trunk/
+security_transforms  		http://svn.zephyr-software.com/repos/security_transforms/trunk/
+irdb_transforms      		http://svn.zephyr-software.com/repos/irdb_transforms/trunk/
+SMPStaticAnalyzer    		http://svn.zephyr-software.com/repos/SMPStaticAnalyzer/trunk/
+stratafier           		http://svn.zephyr-software.com/repos/stratafier/trunk/
+zipr                 		http://svn.zephyr-software.com/repos/zipr/trunk/
+zipr_install         		http://svn.zephyr-software.com/repos/zipr_install/trunk/
+zipr_callbacks       		http://svn.zephyr-software.com/repos/zipr_callbacks/trunk/
+zipr_sdk             		http://svn.zephyr-software.com/repos/zipr_sdk/trunk/
+zipr_scfi_plugin     		http://svn.zephyr-software.com/repos/zipr_scfi_plugin/trunk
+zipr_large_only_plugin     	http://svn.zephyr-software.com/repos/zipr_large_only_plugin/trunk
+zipr_push64_reloc_plugin     	http://svn.zephyr-software.com/repos/zipr_push64_reloc_plugin/trunk
+IdaProServer         		http://svn.zephyr-software.com/repos/IdaProServer/trunk/
+DieHard         		https://github.com/emeryberger/DieHard/trunk
+DieHard/src/Heap-Layers     	https://github.com/emeryberger/Heap-Layers/trunk