[med-svn] r11074 - trunk/packages/strap-base/trunk/debian

[Christoph Gille]

Author: christophgil-guest
Date: 2012-05-29 21:08:03 +0000 (Tue, 29 May 2012)
New Revision: 11074

Modified:
   trunk/packages/strap-base/trunk/debian/rules
   trunk/packages/strap-base/trunk/debian/strap-base.install
Log:


Modified: trunk/packages/strap-base/trunk/debian/rules
===================================================================
--- trunk/packages/strap-base/trunk/debian/rules	2012-05-29 16:21:37 UTC (rev 11073)
+++ trunk/packages/strap-base/trunk/debian/rules	2012-05-29 21:08:03 UTC (rev 11074)
@@ -10,47 +10,25 @@
 
 #SRC_TMP  := $(shell mktemp --tmpdir --directory strap-base-build.XXXXXXXXXX)
 SRC_TMP := $(HOME)/tmp/build_strap-base
-usj := /usr/share/java/
-CP=.:$(SRC_TMP)/compilationDependencies.jar:$(usj)javatar.jar:$(usj)activation.jar:$(usj)commons-codec.jar:$(usj)commons-httpclient.jar:$(usj)commons-logging.jar:$(usj)httpclient.jar:$(usj)httpclient.jar:$(usj)httpcore.jar:$(usj)httpmime.jar
+TARBALLS := $(CURDIR)/../tarballs
+ORIG_TAR=$(TARBALLS)/strap-base_$(VERSION).orig.tar.gz
 
-SKIP :=Superimpose_LajollaProtein.java\|ChJv.java\|Flavine.java\|ChAquaScrollBarUI\|StrapMacApplicationListener
-REPACKED := strap-base-$(VERSION)
-STRAPSRC := ~/tmp/build_strap-base/strap-base-$(VERSION)
 
 override_dh_installdocs:
-	echo override_dh_installdocs -- do nothing
+	echo dh_installdocs -- do nothing
 
 override_dh_auto_build:
 	dh_auto_build
-	echo A little native program to handle windows under X11. Supports always-on-top, iconization, to-front etc.
-	cd $(STRAPSRC)/charite/christo/files/src/ && unzip -o nativeTools_unix2.zip && cc -lm -lX11 -o nativeTools_unix2.exe nativeTools_unix2.c
-	cd $(STRAPSRC) && find . -name "*.java" | tr ' ' '\n' | grep -v '$(SKIP)' > ../javaFiles.txt
-	cd $(STRAPSRC) && javac -cp $(CP)  @../javaFiles.txt
-	cd $(STRAPSRC) && echo "Main-Class: charite.christo.strap.Strap"> Manifest
-	jar -cmf $(STRAPSRC)/Manifest strap-protein-alignment-$(VERSION).jar  -C $(STRAPSRC) charite
+	cd $(SRC_TMP) && tar -xzf $(ORIG_TAR)
+	# Native program to manage GUI frames by frame title. It provides always-on-top, iconization, to-front etc.
+	cd $(SRC_TMP)/src && cc -lm -lX11 -o $(CURDIR)/nativeTools_unix2 nativeTools_unix2.c
+	cd $(SRC_TMP)/src && echo javac -O -cp @$(SRC_TMP)/classpath.txt   @$(SRC_TMP)/javaFiles.txt
+	cd $(SRC_TMP)/src && jar -cmf $(SRC_TMP)/Manifest $(CURDIR)/strap-protein-alignment-$(VERSION).jar *
 
 override_dh_clean:
 	dh_clean
 
 
-ORIG_JAR := $(SRC_TMP)/strap-base_$(VERSION).jar
-TARBALLS := $(CURDIR)/../tarballs
-
 get-orig-source:
-	mkdir -p doc # otherwise Error in rules binary: dh_installdocs cp: cannot stat `doc/': No such file or directory
-	mkdir -p $(STRAPSRC)
 	mkdir -p $(TARBALLS)
-	mkdir -p $(SRC_TMP)
-	[ -f $(ORIG_JAR) ] || wget -O $(ORIG_JAR) http://www.bioinformatics.org/strap/debian/strap.jar	
-    # We need only the source code files in strap.jar and will delete all .class files
-	cd  $(STRAPSRC) && unzip -o -q $(ORIG_JAR) && find . -name "*.class" -delete	
-	# Rremove icons which are not needed under linux
-	cd $(STRAPSRC)/charite/christo/myIcons/ && rm ncbi32x32.jpg AquaLookAndFeel.gif cygwin.gif umbrella.gif safari.gif scale.gif
-	# Remove MS-Windows binaries
-	cd  $(STRAPSRC)/charite/christo/files; rm -r src/*windows* bin/
-    # compilationDependencies.jar is needed only during compilation but not at runtime
-	# E.g. it contains classes of the jnlp API which are not part in openjdk. They are not needed at runtime when started from command line.
-	cd  $(SRC_TMP) && wget -N http://www.bioinformatics.org/strap/debian/compilationDependencies.jar
-	cd  $(SRC_TMP) && tar -czf $(TARBALLS)/strap-base_$(VERSION).orig.tar.gz $(REPACKED)
-	cd  $(SRC_TMP) && ls
-	#rm -rf $(SRC_TMP)
+	[ -f $(ORIG_TAR) ]  &&  wget -N -O $(ORIG_TAR) http://www.bioinformatics.org/strap/debian/strap-base_$(VERSION).orig.tar.gz 

Modified: trunk/packages/strap-base/trunk/debian/strap-base.install
===================================================================
--- trunk/packages/strap-base/trunk/debian/strap-base.install	2012-05-29 16:21:37 UTC (rev 11073)
+++ trunk/packages/strap-base/trunk/debian/strap-base.install	2012-05-29 21:08:03 UTC (rev 11074)
@@ -1 +1,2 @@
-strap-protein-alignment-1.jar		usr/lib/java
+strap-protein-alignment-1.jar		usr/lib/strap-base
+nativeTools_unix2		usr/lib/strap-base