[pkg-java] r9447 - trunk/bnd/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Aug 2 00:02:57 UTC 2009


Author: ludovicc-guest
Date: 2009-08-02 00:02:26 +0000 (Sun, 02 Aug 2009)
New Revision: 9447

Modified:
   trunk/bnd/debian/changelog
   trunk/bnd/debian/orig-tar.sh
   trunk/bnd/debian/rules
   trunk/bnd/debian/svn-transform.sh
Log:
* Release

Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2009-08-01 23:05:56 UTC (rev 9446)
+++ trunk/bnd/debian/changelog	2009-08-02 00:02:26 UTC (rev 9447)
@@ -1,4 +1,4 @@
-bnd (0.0.337.1-0ubuntu1~ppa10) karmic; urgency=low
+bnd (0.0.337.1-1) experimental; urgency=low
 
   * Initial release. (Closes: #539558)
 

Modified: trunk/bnd/debian/orig-tar.sh
===================================================================
--- trunk/bnd/debian/orig-tar.sh	2009-08-01 23:05:56 UTC (rev 9446)
+++ trunk/bnd/debian/orig-tar.sh	2009-08-02 00:02:26 UTC (rev 9447)
@@ -9,12 +9,12 @@
 
 # Use a script to transform the current codebase.
 # Hopefully the next release of BND will adopt this layout
-chmod +x svn-transform.sh
-svn-transform.sh bnd-cvs $DIR
+chmod +x debian/svn-transform.sh
+debian/svn-transform.sh bnd-cvs $DIR
 rm -r bnd-cvs
 
 tar -c -z -f $TAR $DIR
-rm -rf $DIR ../$TAG
+#rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then


Property changes on: trunk/bnd/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/bnd/debian/rules
===================================================================
--- trunk/bnd/debian/rules	2009-08-01 23:05:56 UTC (rev 9446)
+++ trunk/bnd/debian/rules	2009-08-02 00:02:26 UTC (rev 9447)
@@ -19,4 +19,5 @@
 	-rm -rf debian/tmp
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	#-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	debian/orig-tar.sh "" $(VERSION)

Modified: trunk/bnd/debian/svn-transform.sh
===================================================================
--- trunk/bnd/debian/svn-transform.sh	2009-08-01 23:05:56 UTC (rev 9446)
+++ trunk/bnd/debian/svn-transform.sh	2009-08-02 00:02:26 UTC (rev 9447)
@@ -32,12 +32,12 @@
 rsync --cvs-exclude -r $SRC/aQute.bnd/META-INF $SRC/aQute.bnd/icons $DEST/core/src/main/resources/   
 rsync -avmr --filter='+ */' --filter='+ *.properties' --filter='- *' $SRC/aQute.bnd/src $DEST/core/src/main/resources/   
 
-rsync --cvs-exclude -r --exclude 'com.acme' --exclude 'iht' --exclude 'include.bnd' --exclude 'repo' --exclude 'resourcesonly' --exclude 'signing' --exclude 'split' --exclude '*.jar' --exclude '*.class' --exclude '*.jclass' --exclude '*.clazz' --exclude '*.bnd' --exclude '*.mf' --exclude '*.prop' --exclude '*.info' --exclude '*.spring' $SRC/aQute.bnd/src/test $DEST/core/src/test/java/
-cd $SRC/aQute.bnd/src/test
-rsync --cvs-exclude -r com.acme iht include.bnd repo resourcesonly signing split *.jar *.class *.jclass *.clazz *.bnd *.mf *.prop *.info *.spring $DEST/core/src/test/resources/test
-cd -
-rsync --cvs-exclude -r $SRC/aQute.bnd/test/ $DEST/core/src/test/resources/   
-rsync --cvs-exclude -r $SRC/aQute.bnd/bnd $DEST/core/src/test/resources/
+#rsync --cvs-exclude -r --exclude 'com.acme' --exclude 'iht' --exclude 'include.bnd' --exclude 'repo' --exclude 'resourcesonly' --exclude 'signing' --exclude 'split' --exclude '*.jar' --exclude '*.class' --exclude '*.jclass' --exclude '*.clazz' --exclude '*.bnd' --exclude '*.mf' --exclude '*.prop' --exclude '*.info' --exclude '*.spring' $SRC/aQute.bnd/src/test $DEST/core/src/test/java/
+#cd $SRC/aQute.bnd/src/test
+#rsync --cvs-exclude -r com.acme iht include.bnd repo resourcesonly signing split *.jar *.class *.jclass *.clazz *.bnd *.mf *.prop *.info *.spring $DEST/core/src/test/resources/test
+#cd -
+#rsync --cvs-exclude -r $SRC/aQute.bnd/test/ $DEST/core/src/test/resources/   
+#rsync --cvs-exclude -r $SRC/aQute.bnd/bnd $DEST/core/src/test/resources/
 
 mkdir -p $DEST/compilerversions/src/main/java
 mkdir -p $DEST/compilerversions/src/main/bnd
@@ -64,20 +64,20 @@
 cp $SRC/aQute.bnd/TODO $DEST
 cp $SRC/aQute.bnd/testreqs $DEST
 
-echo "Perl back magic..."
+#echo "Perl back magic..."
 #perl -p -i -e 's|src/test|src/test/java/test|g' $DEST/core/src/test/java/test/*.java
 #perl -p -i -e 's|"bin"|"target/test-classes"|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|"aQute\.bnd"|"core"|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|TargetFolder=test|TargetFolder=src/test/resources|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|\"/=src/test|"/=src/test/java/test|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|extends TestCase|extends BaseTestCase|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|new File\("bin"\)|binDir|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|new File\("src"\)|srcDir|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|new File\("(.*)"\)|locateFile("\1")|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|locateFile\("src/|locateFile("|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|locateFile\("test"\)|testSrcDir|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|contains\("src/test|contains("test|g' $DEST/core/src/test/java/test/*.java
-perl -p -i -e 's|\"src\"|srcDir.getAbsolutePath()|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|"aQute\.bnd"|"core"|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|TargetFolder=test|TargetFolder=src/test/resources|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|\"/=src/test|"/=src/test/java/test|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|extends TestCase|extends BaseTestCase|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|new File\("bin"\)|binDir|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|new File\("src"\)|srcDir|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|new File\("(.*)"\)|locateFile("\1")|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|locateFile\("src/|locateFile("|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|locateFile\("test"\)|testSrcDir|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|contains\("src/test|contains("test|g' $DEST/core/src/test/java/test/*.java
+#perl -p -i -e 's|\"src\"|srcDir.getAbsolutePath()|g' $DEST/core/src/test/java/test/*.java
 
 echo "Create Maven and Eclipse files..."
 cat > $DEST/pom.xml <<EOF
@@ -527,51 +527,51 @@
 </projectDescription>
 EOF
 
-cat > $DEST/core/src/test/java/test/BaseTestCase.java <<EOF
-package test;
+#cat > $DEST/core/src/test/java/test/BaseTestCase.java <<EOF
+#package test;
+#
+#import java.io.File;
+#
+#import junit.framework.TestCase;
+#
+#public class BaseTestCase extends TestCase {
+#
+#	protected File binDir;
+#	protected File srcDir;
+#	protected File testSrcDir;
+#	
+#	protected void setUp() throws Exception {
+#		super.setUp();
+#		binDir = new File("target/test-classes");
+#		if (!binDir.exists()) {
+#			binDir = new File("bin");
+#		}
+#		srcDir = new File("src/test/java");
+#		testSrcDir = new File(srcDir, "test");
+#	}
+#	
+#	protected File locateFile(String relPath) {
+#		File found = null;
+#		if (getClass().getResource("/" + relPath) != null) {
+#			String path = getClass().getResource("/" + relPath).getPath();
+#			path = path.replace("file:", "");
+#			System.out.println(path);
+#			found = new File(path);
+#			if (!found.exists()) {
+#				found = null;
+#			}
+#		}
+#		if (found == null) {
+#			found = new File("src/test/resources/" + relPath);
+#			if (!found.exists()) {
+#				found = new File("src/test/java/" + relPath);
+#			}
+#		}
+#		return found;
+#	}
+#}
+#EOF
 
-import java.io.File;
-
-import junit.framework.TestCase;
-
-public class BaseTestCase extends TestCase {
-
-	protected File binDir;
-	protected File srcDir;
-	protected File testSrcDir;
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		binDir = new File("target/test-classes");
-		if (!binDir.exists()) {
-			binDir = new File("bin");
-		}
-		srcDir = new File("src/test/java");
-		testSrcDir = new File(srcDir, "test");
-	}
-	
-	protected File locateFile(String relPath) {
-		File found = null;
-		if (getClass().getResource("/" + relPath) != null) {
-			String path = getClass().getResource("/" + relPath).getPath();
-			path = path.replace("file:", "");
-			System.out.println(path);
-			found = new File(path);
-			if (!found.exists()) {
-				found = null;
-			}
-		}
-		if (found == null) {
-			found = new File("src/test/resources/" + relPath);
-			if (!found.exists()) {
-				found = new File("src/test/java/" + relPath);
-			}
-		}
-		return found;
-	}
-}
-EOF
-
 cat > $DEST/eclipse/.classpath <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>




More information about the pkg-java-commits mailing list