|
From: Rob M. <man...@us...> - 2010-01-23 16:43:35
|
Update of /cvsroot/squirrel-sql/mavenize In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5568 Modified Files: mavenize.pl Log Message: Previous approach whacked the .svn directories in the target folders. Now we just avoid copying the source folder .svn directories. Index: mavenize.pl =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mavenize.pl 23 Jan 2010 15:03:18 -0000 1.17 --- mavenize.pl 23 Jan 2010 16:43:26 -0000 1.18 *************** *** 633,639 **** svnmkdir("$installerDir/squirrelsql-java-version-checker/src/main/java"); svnmkdir("$installerDir/squirrelsql-java-version-checker/src/main/resources"); ! `cp -r $mavenizeDir/squirrelsql-java-version-checker $installerDir`; ! ! #`cp -r $mavenizeDir/squirrelsql-java-version-checker $installerDir/squirrelsql-java-version-checker/pom.xml`; #`cp $mavenizeDir/squirrelsql-java-version-checker/src/main/java/JavaVersionChecker.java $installerDir/squirrelsql-java-version-checker/src/main/java/JavaVersionChecker.java`; #`cp $mavenizeDir/squirrelsql-java-version-checker/src/main/resources/versioncheck.jar $installerDir/squirrelsql-java-version-checker/src/main/resources/versioncheck.jar`; --- 633,638 ---- svnmkdir("$installerDir/squirrelsql-java-version-checker/src/main/java"); svnmkdir("$installerDir/squirrelsql-java-version-checker/src/main/resources"); ! `tar --exclude .svn -cvf - squirrelsql-java-version-checker | ( cd $installerDir; tar -xvf -)`; ! #`cp -r $mavenizeDir/squirrelsql-java-version-checker $installerDir`; #`cp $mavenizeDir/squirrelsql-java-version-checker/src/main/java/JavaVersionChecker.java $installerDir/squirrelsql-java-version-checker/src/main/java/JavaVersionChecker.java`; #`cp $mavenizeDir/squirrelsql-java-version-checker/src/main/resources/versioncheck.jar $installerDir/squirrelsql-java-version-checker/src/main/resources/versioncheck.jar`; *************** *** 644,648 **** svnmkdir("$installerDir/squirrelsql-launcher/src/main/resources/icons"); svnmkdir("$installerDir/squirrelsql-launcher/src/main/resources/plugins"); ! `cp -r $mavenizeDir/squirrelsql-launcher $installerDir`; #`svn add $installerDir/squirrelsql-launcher/src/main/resources/icons/*`; #`svn add $installerDir/squirrelsql-launcher/src/main/resources/plugins/*`; --- 643,647 ---- svnmkdir("$installerDir/squirrelsql-launcher/src/main/resources/icons"); svnmkdir("$installerDir/squirrelsql-launcher/src/main/resources/plugins"); ! `tar --exclude .svn -cvf - squirrelsql-launcher | ( cd $installerDir; tar -xvf -)`; #`svn add $installerDir/squirrelsql-launcher/src/main/resources/icons/*`; #`svn add $installerDir/squirrelsql-launcher/src/main/resources/plugins/*`; *************** *** 650,654 **** svnmkdir("$installerDir/squirrelsql-other-installer/src/main/resources"); ! `cp -r $mavenizeDir/squirrelsql-other-installer $installerDir`; #`svn add $installerDir/squirrelsql-other-installer/src/main/resources/*`; #`svn add $installerDir/squirrelsql-other-installer/pom.xml`; --- 649,653 ---- svnmkdir("$installerDir/squirrelsql-other-installer/src/main/resources"); ! `tar --exclude .svn -cvf - squirrelsql-other-installer | ( cd $installerDir; tar -xvf -)`; #`svn add $installerDir/squirrelsql-other-installer/src/main/resources/*`; #`svn add $installerDir/squirrelsql-other-installer/pom.xml`; *************** *** 657,666 **** #`svn add $installerDir/pom.xml`; - `find $installerDir -type d -name .svn | xargs rm -rf `; `svn st $installerDir | grep "^\?" | awk '{print $2}' | xargs svn add`; - return if $onlyCopyPoms; - - chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 656,661 ---- |
