|
From: Rob M. <man...@us...> - 2010-03-21 15:39:21
|
Update of /cvsroot/squirrel-sql/mavenize In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24422 Modified Files: mavenize.pl Added Files: svn-ignore.txt Log Message: Add svn:ignore property for commonly ignored resources. Index: mavenize.pl =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mavenize.pl 20 Mar 2010 22:04:09 -0000 1.23 --- mavenize.pl 21 Mar 2010 15:39:13 -0000 1.24 *************** *** 497,500 **** --- 497,503 ---- return if $onlyCopyPoms; `svn add $topDir/pom.xml`; + + setSvnIgnore($topDir); + chdirOrDie($mavenizeDir); } *************** *** 511,514 **** --- 514,520 ---- `cp $mavenizeDir/squirrelsql-test-utils/pom.xml $topDir/squirrelsql-test-utils/pom.xml`; `svn add $topDir/squirrelsql-test-utils/pom.xml`; + + setSvnIgnore("$topDir/squirrelsql-test-utils"); + chdirOrDie($mavenizeDir); } *************** *** 516,520 **** print "Copying in plugins support projects\n"; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; svnmkdir("$pluginsDir/squirrelsql-plugins-assembly-descriptor/src/main/resources/assemblies"); --- 522,526 ---- print "Copying in plugins support projects\n"; ! chdirOrDie($mavenizeDir); svnmkdir("$pluginsDir/squirrelsql-plugins-assembly-descriptor/src/main/resources/assemblies"); *************** *** 526,530 **** `svn add $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 532,539 ---- `svn add $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`; ! setSvnIgnore("$pluginsDir/squirrelsql-plugins-assembly-descriptor"); ! setSvnIgnore("$pluginsDir/squirrelsql-plugins-parent-pom"); ! ! chdirOrDie($mavenizeDir); } *************** *** 550,554 **** return if $onlyCopyPoms; ! chdir("$fwDir/src") or die "Couldn't change directory to $fwDir/src: $!\n"; findAndCopyJava(); --- 559,563 ---- return if $onlyCopyPoms; ! chdirOrDie("$fwDir/src"); findAndCopyJava(); *************** *** 562,571 **** `svn add --quiet test`; ! chdir("$fwDir") or die "Couldn't change directory to $fwDir: $!\n"; `svn delete net`; `svn delete lib`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 571,582 ---- `svn add --quiet test`; ! chdirOrDie($fwDir); `svn delete net`; `svn delete lib`; + + setSvnIgnore($fwDir); ! chdirOrDie($mavenizeDir); } *************** *** 606,610 **** `svn add test`; ! chdir("$appDir/cmd") or die "Couldn\'t change directory to $appDir/cmd: $!\n"; `svn move addpath.bat $installerDir/squirrelsql-launcher/src/main/resources`; --- 617,621 ---- `svn add test`; ! chdirOrDie("$appDir/cmd"); `svn move addpath.bat $installerDir/squirrelsql-launcher/src/main/resources`; *************** *** 616,626 **** `svn move update-log4j.properties $installerDir/squirrelsql-launcher/src/main/resources`; ! chdir("$appDir") or die "Couldn\'t change directory to $appDir: $!\n"; `svn delete lib`; `svn delete icons`; `svn delete cmd`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 627,639 ---- `svn move update-log4j.properties $installerDir/squirrelsql-launcher/src/main/resources`; ! chdirOrDie($appDir); `svn delete lib`; `svn delete icons`; `svn delete cmd`; + + setSvnIgnore($appDir); ! chdirOrDie($mavenizeDir); } *************** *** 656,660 **** sub copyInstallerProjects { ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; print "Copying in installer projects\n"; --- 669,673 ---- sub copyInstallerProjects { ! chdirOrDie($mavenizeDir); print "Copying in installer projects\n"; *************** *** 689,693 **** `svn st $installerDir | grep "^\?" | awk '{print $2}' | xargs svn add`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 702,723 ---- `svn st $installerDir | grep "^\?" | awk '{print $2}' | xargs svn add`; ! setSvnIgnore($installerDir); ! setSvnIgnore("$installerDir/squirrelsql-launcher"); ! setSvnIgnore("$installerDir/squirrelsql-other-installer"); ! setSvnIgnore("$installerDir/squirrelsql-macosx-installer"); ! setSvnIgnore("$installerDir/squirrelsql-java-version-checker"); ! ! chdirOrDie($mavenizeDir); ! } ! ! sub setSvnIgnore { ! my $projectDir = shift; ! chdirOrDie($projectDir); ! `svn propset svn:ignore --file $mavenizeDir/svn-ignore.txt . `; ! } ! ! sub chdirOrDie { ! my $newDir = shift; ! chdir($newDir) or die "Couldn't change directory to $newDir: $!\n"; } *************** *** 715,719 **** `svn remove translations`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 745,751 ---- `svn remove translations`; ! setSvnIgnore("$topDir/squirrelsql-translations"); ! ! chdirOrDie($mavenizeDir); } *************** *** 739,742 **** --- 771,780 ---- `svn add $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`; `svn add $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java`; + + setSvnIgnore("$topDir/update-site"); + setSvnIgnore("$topDir/update-site/squirrelsql-update-site"); + setSvnIgnore("$topDir/update-site/squirrelsql-update-site-plugin"); + + chdirOrDie($mavenizeDir); } *************** *** 764,768 **** `find . -type f -print | grep -v .svn | grep -v pom.xml | grep -v target | uniq | sort | xargs -ti svn move {} src/main/resources/{}`; ! chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; } --- 802,808 ---- `find . -type f -print | grep -v .svn | grep -v pom.xml | grep -v target | uniq | sort | xargs -ti svn move {} src/main/resources/{}`; ! setSvnIgnore("$docDir"); ! ! chdirOrDie($mavenizeDir); } *************** *** 780,783 **** --- 820,827 ---- `cp $websiteDir/faq.html $websiteDir/src/main/resources`; `svn add $websiteDir/src`; + + setSvnIgnore("$websiteDir"); + + chdirOrDie($mavenizeDir); } *************** *** 835,843 **** sub removeRemainingUnnecessaryFiles { ! chdir($topDir) or die "Couldn't change dir to ($topDir): $!\n"; `svn delete stats`; `svn delete mac`; ! chdir($testDir) or die "Couldn't change dir to ($testDir): $!\n"; `svn delete lib`; } --- 879,893 ---- sub removeRemainingUnnecessaryFiles { ! chdirOrDie($topDir); `svn delete stats`; `svn delete mac`; ! ! chdirOrDie($testDir); `svn delete lib`; + chdirOrDie($pluginsDir); + `find . -name plugin_build.xml | xargs -i svn propset svn:ignore --file $mavenizeDir/svn-ignore.txt {}`; + `find . -name plugin_build.xml | xargs svn delete`; + + chdirOrDie($mavenizeDir); } --- NEW FILE: svn-ignore.txt --- target .settings .project .classpath |
