[med-svn] r8602 - trunk/packages/strap/trunk/debian

[Christoph Gille]

Author: christophgil-guest
Date: 2011-11-18 07:49:01 +0000 (Fri, 18 Nov 2011)
New Revision: 8602

Modified:
   trunk/packages/strap/trunk/debian/rules
   trunk/packages/strap/trunk/debian/strap.debhelper.log
Log:


Modified: trunk/packages/strap/trunk/debian/rules
===================================================================
--- trunk/packages/strap/trunk/debian/rules	2011-11-17 23:15:06 UTC (rev 8601)
+++ trunk/packages/strap/trunk/debian/rules	2011-11-18 07:49:01 UTC (rev 8602)
@@ -1,26 +1,19 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 VERSION  := 1
-SRC_TMP  := $(shell mktemp --tmpdir --directory strap-build.XXXXXXXXXX)
-REPACKED := strap-$(VERSION)
-TARBALLS := $(CURDIR)/../tarballs
 
 %:
 	dh $@
 
-TARBALLS := $(CURDIR)/../tarballs
-DEP_JAR := $(TARBALLS)/compilationDependencies.jar
-CP := .:$(DEP_JAR):/usr/share/java/javatar.jar:/usr/share/java/activation.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-logging.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpmime.jar
+CP := .:compilationDependencies.jar:/usr/share/java/javatar.jar:/usr/share/java/activation.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-logging.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpmime.jar
 
-SKIP := /metannogen/\|Superimpose_LajollaProtein.java\|ChJv.java\|Flavine.java\|ChAquaScrollBarUI\|StrapMacApplicationListener
+SKIP :=Superimpose_LajollaProtein.java\|ChJv.java\|Flavine.java\|ChAquaScrollBarUI\|StrapMacApplicationListener
 
 override_dh_auto_build:
 	dh_auto_build	
-	echo xxxxxxxxxxxxxxxxxxxxxxxxxxxx '$(SRC_TMP)'
 	find . -name "*.java" | tr ' ' '\n' | grep -v '$(SKIP)' > ../javaFiles.txt
 	javac -cp $(CP)  $(shell cat ../javaFiles.txt )
 	echo "Main-Class: charite.christo.strap.Strap"> Manifest
@@ -29,16 +22,19 @@
 override_dh_clean:
 	dh_clean
 
-SRC_TMP  := $(shell mktemp --tmpdir --directory strap-build.XXXXXXXXXX)
+#SRC_TMP  := $(shell mktemp --tmpdir --directory strap-build.XXXXXXXXXX)
+SRC_TMP := ~/tmp/build_strap
+
 ORIG_JAR := $(SRC_TMP)/strap_$(VERSION).jar
 REPACKED := strap-$(VERSION)
+TARBALLS := $(CURDIR)/../tarballs
 
 get-orig-source:
-	[ -f $(ORIG_JAR) ] || wget -q -O $(ORIG_JAR) http://www.bioinformatics.org/strap/debian/strap.jar
-	[ -f $(DEP_JAR) ]  || wget -q -O $(DEP_JAR)  http://www.bioinformatics.org//strap/debian/compilationDependencies.jar
-	rm -rf $(SRC_TMP)/$(REPACKED)
-	mkdir  $(SRC_TMP)/$(REPACKED)
-	cd     $(SRC_TMP)/$(REPACKED) && unzip -q $(ORIG_JAR) && find . -name "*.class"-delete
-	[ -d $(TARBALLS) ] || mkdir $(TARBALLS)
-	cd $(SRC_TMP) && GZIP="--best --no-name" tar -czf $(TARBALLS)/strap_$(VERSION).orig.tar.gz $(REPACKED)
-	rm -rf $(SRC_TMP)
\ No newline at end of file
+	mkdir -p $(SRC_TMP)/$(REPACKED)
+	mkdir -p $(TARBALLS)
+	[ -f $(ORIG_JAR) ] || wget -O $(ORIG_JAR) http://www.bioinformatics.org/strap/debian/strap.jar	
+	cd  $(SRC_TMP)/$(REPACKED) && unzip -q $(ORIG_JAR) && find . -name "*.class" -delete	
+	cd  $(SRC_TMP)/$(REPACKED) && wget -N http://www.bioinformatics.org//strap/debian/compilationDependencies.jar
+	cd  $(SRC_TMP) && tar -czf $(TARBALLS)/strap_$(VERSION).orig.tar.gz $(REPACKED)
+	cd  $(SRC_TMP) && ls
+	#rm -rf $(SRC_TMP)

Modified: trunk/packages/strap/trunk/debian/strap.debhelper.log
===================================================================
--- trunk/packages/strap/trunk/debian/strap.debhelper.log	2011-11-17 23:15:06 UTC (rev 8601)
+++ trunk/packages/strap/trunk/debian/strap.debhelper.log	2011-11-18 07:49:01 UTC (rev 8602)
@@ -50,3 +50,10 @@
 dh_auto_build
 dh_auto_build
 dh_auto_build
+dh_auto_build
+dh_auto_build
+dh_auto_build
+dh_auto_build
+dh_auto_build
+dh_auto_build
+dh_auto_build