Thread: [Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5571] trunk/mavenize/mavenize.pl
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <man...@us...> - 2010-04-05 00:01:01
|
Revision: 5571 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5571&view=rev Author: manningr Date: 2010-04-05 00:00:55 +0000 (Mon, 05 Apr 2010) Log Message: ----------- More debug logging. Move rather than copy integration environment. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-04-04 21:40:47 UTC (rev 5570) +++ trunk/mavenize/mavenize.pl 2010-04-05 00:00:55 UTC (rev 5571) @@ -458,7 +458,7 @@ print "pluginName: $pluginName\n"; svnmkdir("$pluginsDir/$pluginName/src/test/java/$relativeDir"); - `svn add $pluginsDir/$pluginName/src/test`; + `svn add --quiet $pluginsDir/$pluginName/src/test`; `svn move $File::Find::name $pluginsDir/$pluginName/src/test/java/$relativeDir`; } @@ -530,7 +530,7 @@ svnmkdir("$pluginsDir/squirrelsql-plugins-assembly-descriptor/src/main/resources/assemblies"); `tar --exclude .svn -cvf - squirrelsql-plugins-assembly-descriptor | ( cd $pluginsDir; tar -xvf -)`; - `svn st $pluginsDir/squirrelsql-plugins-assembly-descriptor | grep "^\?" | awk '{print $2}' | xargs svn add`; + `svn st $pluginsDir/squirrelsql-plugins-assembly-descriptor | grep "^\?" | awk '{print \$2}' | xargs svn add`; svnmkdir("$pluginsDir/squirrelsql-plugins-parent-pom"); `cp $mavenizeDir/squirrelsql-plugins-parent-pom/pom.xml $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`; @@ -686,11 +686,8 @@ chdirOrDie($mavenizeDir); print "Copying in integration environment project\n"; - svnmkdir("$topDir/squirrelsql-integration-environment/src/main/java"); - `tar --exclude .svn -cvf - squirrelsql-integration-environment | ( cd $installerDir; tar -xvf -)`; + `svn move $mavenizeDir/squirrelsql-integration-environment $topDir`; - `svn st $topDir/squirrelsql-integration-environment | grep "^\?" | awk '{print \$2}' | xargs svn add`; - setSvnIgnore("$topDir/squirrelsql-integration-environment"); chdirOrDie($mavenizeDir); @@ -748,6 +745,7 @@ sub chdirOrDie { my $newDir = shift; + print "Changing directory to $newDir"; chdir($newDir) or die "Couldn't change directory to $newDir: $!\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-04-05 01:19:16
|
Revision: 5572 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5572&view=rev Author: manningr Date: 2010-04-05 01:19:10 +0000 (Mon, 05 Apr 2010) Log Message: ----------- re-order to avoid finding files prematurely. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-04-05 00:00:55 UTC (rev 5571) +++ trunk/mavenize/mavenize.pl 2010-04-05 01:19:10 UTC (rev 5572) @@ -162,9 +162,6 @@ # copy in the installer projects copyInstallerProjects(); -# copy in the integration environment project -copyIntegrationEnvironmentProject(); - # copy in the translations project copyTranslationProjects(); @@ -204,6 +201,9 @@ # Miscellaneous installLafPluginAssembly(); +# copy in the integration environment project +copyIntegrationEnvironmentProject(); + removeRemainingUnnecessaryFiles(); # End of script; Begin Subroutines This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-04-30 01:36:07
|
Revision: 5604 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5604&view=rev Author: manningr Date: 2010-04-30 01:36:00 +0000 (Fri, 30 Apr 2010) Log Message: ----------- Use the standard firebird maven coordinates. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-04-30 01:25:13 UTC (rev 5603) +++ trunk/mavenize/mavenize.pl 2010-04-30 01:36:00 UTC (rev 5604) @@ -52,9 +52,9 @@ $firebirdmanager_deps = <<"EOF"; <dependencies> <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> + <groupId>org.firebirdsql.jdbc</groupId> <artifactId>jaybird</artifactId> - <version>2.1.1</version> + <version>2.1.6</version> </dependency> </dependencies> EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-05-02 20:00:01
|
Revision: 5614 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5614&view=rev Author: manningr Date: 2010-05-02 19:59:55 +0000 (Sun, 02 May 2010) Log Message: ----------- Use latest fifesoft rtext deployed to maven central (1.1.0) Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-05-02 19:59:13 UTC (rev 5613) +++ trunk/mavenize/mavenize.pl 2010-05-02 19:59:55 UTC (rev 5614) @@ -84,28 +84,13 @@ </dependency> EOF $syntax_deps = <<"EOF"; + <dependency> + <groupId>com.fifesoft.rtext</groupId> + <artifactId>rtext</artifactId> + <version>1.1.0</version> + </dependency> <dependency> <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>com-fifesoft-common</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>com-fifesoft-rtext</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>com-fifesoft-autocomplete</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>com-fifesoft-rsyntaxtextarea</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>openide</artifactId> <version>4.0</version> </dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-08 01:30:33
|
Revision: 5671 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5671&view=rev Author: manningr Date: 2010-07-08 01:30:23 +0000 (Thu, 08 Jul 2010) Log Message: ----------- Add version plugin project to migration Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-07 22:17:06 UTC (rev 5670) +++ trunk/mavenize/mavenize.pl 2010-07-08 01:30:23 UTC (rev 5671) @@ -186,6 +186,8 @@ removeRemainingUnnecessaryFiles(); +copyVersionPluginProject(); + # End of script; Begin Subroutines sub wanted_for_create_plugin_poms { @@ -800,6 +802,8 @@ `svn add $topDir/squirrelsql-version-plugin/pom.xml`; `svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`; + + setSvnIgnore("$topDir/squirrelsql-version-plugin"); } sub restructureDocModule { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-10 19:42:28
|
Revision: 5678 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5678&view=rev Author: manningr Date: 2010-07-10 19:42:22 +0000 (Sat, 10 Jul 2010) Log Message: ----------- Delete laf archives which are now brought in by dependencies. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-10 19:41:38 UTC (rev 5677) +++ trunk/mavenize/mavenize.pl 2010-07-10 19:42:22 UTC (rev 5678) @@ -902,6 +902,10 @@ `svn add $lafPluginDir/src`; `svn add $lafPluginDir/pom.xml`; `svn add $targetFolder/laf-plugin-assembly.xml`; + + `svn delete plugins/laf/lafs`; + `svn delete plugins/laf/oyoaha-theme-packs`; + chdir($lafPluginDir) or die "Couldn't change dir to ($lafPluginDir): $!\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-11 16:43:31
|
Revision: 5692 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5692&view=rev Author: manningr Date: 2010-07-11 16:43:25 +0000 (Sun, 11 Jul 2010) Log Message: ----------- Missing readme files for laf plugin directories. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 16:42:38 UTC (rev 5691) +++ trunk/mavenize/mavenize.pl 2010-07-11 16:43:25 UTC (rev 5692) @@ -904,7 +904,7 @@ `cp $lafPluginAssemblyFile $targetFolder`; return if $onlyCopyPoms; - + `svn add $lafPluginDir/src`; `svn add $lafPluginDir/pom.xml`; `svn add $targetFolder/laf-plugin-assembly.xml`; @@ -912,6 +912,13 @@ `svn delete plugins/laf/lafs`; `svn delete plugins/laf/oyoaha-theme-packs`; + `cp $mavenizeDir/laf-plugin/src/main/resources/readme.txt $lafPluginDir/src/main/resources/`; + `svn add $lafPluginDir/src/main/resources/readme.txt`; + + `svn mkdir --parents $lafPluginDir/src/main/resources/skinlf-theme-packs`; + `cp $mavenizeDir/laf-plugin/src/main/resources/skinlf-theme-packs/skinlf-readme.txt $lafPluginDir/src/main/resources/skinlf-theme-packs/`; + `svn add $lafPluginDir/src/main/resources/skinlf-theme-packs/skinlf-readme.txt`; + chdir($lafPluginDir) or die "Couldn't change dir to ($lafPluginDir): $!\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-11 16:59:25
|
Revision: 5697 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5697&view=rev Author: manningr Date: 2010-07-11 16:59:19 +0000 (Sun, 11 Jul 2010) Log Message: ----------- Changes in light of the permanent movement of installer projects. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 16:57:53 UTC (rev 5696) +++ trunk/mavenize/mavenize.pl 2010-07-11 16:59:19 UTC (rev 5697) @@ -680,26 +680,26 @@ chdirOrDie($mavenizeDir); - print "Copying in installer projects\n"; + print "Copying in mac resources to the macos x installer project\n"; - if (!$onlyCopyPoms) { - `rm -rf $installerDir`; - `mkdir -p $installerDir`; - } + #if (!$onlyCopyPoms) { + # `rm -rf $installerDir`; + # `mkdir -p $installerDir`; + #} - 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 -)`; + #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 -)`; - 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 -)`; + #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 -)`; - svnmkdir("$installerDir/squirrelsql-other-installer/src/main/resources"); - `tar --exclude .svn -cvf - squirrelsql-other-installer | ( cd $installerDir; tar -xvf -)`; + #svnmkdir("$installerDir/squirrelsql-other-installer/src/main/resources"); + #`tar --exclude .svn -cvf - squirrelsql-other-installer | ( cd $installerDir; tar -xvf -)`; - svnmkdir("$installerDir/squirrelsql-macosx-installer/src/main/resources"); - `tar --exclude .svn -cvf - squirrelsql-macosx-installer | ( cd $installerDir; tar -xvf -)`; + #svnmkdir("$installerDir/squirrelsql-macosx-installer/src/main/resources"); + #`tar --exclude .svn -cvf - squirrelsql-macosx-installer | ( cd $installerDir; tar -xvf -)`; `svn move $macDir/Contents/Info.plist $installerDir/squirrelsql-macosx-installer/src/main/resources`; `svn move $macDir/Contents/Resources/acorn.icns $installerDir/squirrelsql-macosx-installer/src/main/resources`; @@ -707,15 +707,15 @@ chdir($topDir) or die "Couldn't change directory to $topDir: $!\n"; `svn delete mac`; - `cp $mavenizeDir/installer-pom.xml $installerDir/pom.xml`; + #`cp $mavenizeDir/installer-pom.xml $installerDir/pom.xml`; - `svn st $installerDir | grep "^\?" | awk '{print \$2}' | xargs svn add`; + #`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"); + #setSvnIgnore($installerDir); + #setSvnIgnore("$installerDir/squirrelsql-launcher"); + #setSvnIgnore("$installerDir/squirrelsql-other-installer"); + #setSvnIgnore("$installerDir/squirrelsql-macosx-installer"); + #setSvnIgnore("$installerDir/squirrelsql-java-version-checker"); chdirOrDie($mavenizeDir); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-11 20:00:02
|
Revision: 5711 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5711&view=rev Author: manningr Date: 2010-07-11 19:59:56 +0000 (Sun, 11 Jul 2010) Log Message: ----------- No longer need to copy in the update site project. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 19:58:28 UTC (rev 5710) +++ trunk/mavenize/mavenize.pl 2010-07-11 19:59:56 UTC (rev 5711) @@ -145,9 +145,6 @@ # copy in the translations project copyTranslationProjects(); -# copy in the update site projects -copyUpdateSiteProjects(); - # restructure fw module restructureFwModule(); @@ -186,8 +183,6 @@ removeRemainingUnnecessaryFiles(); -#copyVersionPluginProject(); - # End of script; Begin Subroutines sub wanted_for_create_plugin_poms { @@ -761,57 +756,6 @@ } -sub copyUpdateSiteProjects { - chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; - - print "Copying in update-site project\n"; - - #!$onlyCopyPoms && `rm -rf $topDir/update-site`; - #!$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql`; - #!$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site`; - !$onlyCopyPoms && `rm -rf $topDir/squirrelsql-update-site`; - !$onlyCopyPoms && `svn mkdir --parents $topDir/squirrelsql-update-site`; - - #`cp $mavenizeDir/update-site/pom.xml $topDir/update-site/`; - #`cp $mavenizeDir/update-site/squirrelsql-update-site/pom.xml $topDir/update-site/squirrelsql-update-site/pom.xml`; - #`cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/pom.xml $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`; - #`cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/`; - `cp $mavenizeDir/update-site/squirrelsql-update-site/pom.xml $topDir/squirrelsql-update-site/pom.xml`; - - return if $onlyCopyPoms; - - #`svn add $topDir/update-site/pom.xml`; - #`svn add $topDir/update-site/squirrelsql-update-site/pom.xml`; - `svn add $topDir/squirrelsql-update-site/pom.xml`; - - #`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"); - setSvnIgnore("$topDir/squirrelsql-update-site"); - - chdirOrDie($mavenizeDir); -} - -#sub copyVersionPluginProject { -# chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n"; -# -# print "Copying in version plugin project\n"; -# -# `svn mkdir --parents $topDir/squirrelsql-version-plugin`; -# `svn mkdir --parents $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`; -# -# `cp $mavenizeDir/squirrelsql-version-plugin/pom.xml $topDir/squirrelsql-version-plugin`; -# `cp $mavenizeDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`; -# -# `svn add $topDir/squirrelsql-version-plugin/pom.xml`; -# `svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`; -# -# setSvnIgnore("$topDir/squirrelsql-version-plugin"); -#} - sub restructureDocModule { print "Restructuring doc module\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-11 21:43:21
|
Revision: 5714 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5714&view=rev Author: manningr Date: 2010-07-11 21:43:15 +0000 (Sun, 11 Jul 2010) Log Message: ----------- Permanently relocated integration environment. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 21:41:09 UTC (rev 5713) +++ trunk/mavenize/mavenize.pl 2010-07-11 21:43:15 UTC (rev 5714) @@ -178,9 +178,6 @@ # Miscellaneous installLafPluginAssembly(); -# copy in the integration environment project -copyIntegrationEnvironmentProject(); - removeRemainingUnnecessaryFiles(); # End of script; Begin Subroutines @@ -659,18 +656,6 @@ `find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; } -sub copyIntegrationEnvironmentProject { - - chdirOrDie($mavenizeDir); - print "Copying in integration environment project\n"; - - `svn move $mavenizeDir/squirrelsql-integration-environment $topDir`; - - setSvnIgnore("$topDir/squirrelsql-integration-environment"); - - chdirOrDie($mavenizeDir); -} - sub copyInstallerProjects { chdirOrDie($mavenizeDir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-11 21:49:57
|
Revision: 5718 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5718&view=rev Author: manningr Date: 2010-07-11 21:49:51 +0000 (Sun, 11 Jul 2010) Log Message: ----------- Permanently relocated plugins support projects. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 21:48:37 UTC (rev 5717) +++ trunk/mavenize/mavenize.pl 2010-07-11 21:49:51 UTC (rev 5718) @@ -133,12 +133,6 @@ # copy in the root pom - this pom builds all of SQuirreL copyRootPom(); -# copy in test dependencies pom -copyTestUtilsProject(); - -# copy in plugins support projects -copyPluginsSupportProjects(); - # copy in the installer projects copyInstallerProjects(); @@ -481,43 +475,6 @@ chdirOrDie($mavenizeDir); } -sub copyTestUtilsProject { - print "Copying in test dependencies pom\n"; - - if ($onlyCopyPoms) { - `cp $mavenizeDir/squirrelsql-test-utils/pom.xml $topDir/squirrelsql-test-utils/pom.xml`; - return; - } - - `rm -rf $topDir/squirrelsql-test-utils`; - svnmkdir("$topDir/squirrelsql-test-utils"); - `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); -} - -sub copyPluginsSupportProjects { - print "Copying in plugins support projects\n"; - - chdirOrDie($mavenizeDir); - - svnmkdir("$pluginsDir/squirrelsql-plugins-assembly-descriptor/src/main/resources/assemblies"); - `tar --exclude .svn -cvf - squirrelsql-plugins-assembly-descriptor | ( cd $pluginsDir; tar -xvf -)`; - `svn st $pluginsDir/squirrelsql-plugins-assembly-descriptor | grep "^\?" | awk '{print \$2}' | xargs svn add`; - - svnmkdir("$pluginsDir/squirrelsql-plugins-parent-pom"); - `cp $mavenizeDir/squirrelsql-plugins-parent-pom/pom.xml $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`; - `svn add $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`; - - setSvnIgnore("$pluginsDir/squirrelsql-plugins-assembly-descriptor"); - setSvnIgnore("$pluginsDir/squirrelsql-plugins-parent-pom"); - setSvnIgnore($pluginsDir); - - chdirOrDie($mavenizeDir); -} - sub restructureFwModule { print "Restructuring fw module\n"; @@ -662,41 +619,12 @@ print "Copying in mac resources to the macos x installer project\n"; - #if (!$onlyCopyPoms) { - # `rm -rf $installerDir`; - # `mkdir -p $installerDir`; - #} - - #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 -)`; - - #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 -)`; - - #svnmkdir("$installerDir/squirrelsql-other-installer/src/main/resources"); - #`tar --exclude .svn -cvf - squirrelsql-other-installer | ( cd $installerDir; tar -xvf -)`; - - #svnmkdir("$installerDir/squirrelsql-macosx-installer/src/main/resources"); - #`tar --exclude .svn -cvf - squirrelsql-macosx-installer | ( cd $installerDir; tar -xvf -)`; - `svn move $macDir/Contents/Info.plist $installerDir/squirrelsql-macosx-installer/src/main/resources`; `svn move $macDir/Contents/Resources/acorn.icns $installerDir/squirrelsql-macosx-installer/src/main/resources`; chdir($topDir) or die "Couldn't change directory to $topDir: $!\n"; `svn delete mac`; - #`cp $mavenizeDir/installer-pom.xml $installerDir/pom.xml`; - - #`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); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-12 22:13:48
|
Revision: 5720 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5720&view=rev Author: manningr Date: 2010-07-12 22:13:42 +0000 (Mon, 12 Jul 2010) Log Message: ----------- exclude squirrelsql-integration-environment from package categorization. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-11 22:29:26 UTC (rev 5719) +++ trunk/mavenize/mavenize.pl 2010-07-12 22:13:42 UTC (rev 5720) @@ -308,6 +308,11 @@ if ( $_ !~ /\.java$/ ) { return; } + return if ( $File::Find::name =~ /sql12\/installer/ ); + return if ( $File::Find::name =~ /sql12\/squirrelsql-integration-environment/ ); + return if ( $File::Find::name =~ /sql12\/squirrelsql-test-utils/ ); + return if ( $File::Find::name =~ /sql12\/test/ ); + return if ( $File::Find::name =~ /sql12\/update-site/ ); $package = getPackageFromFile($File::Find::name); @@ -336,27 +341,7 @@ elsif ( $parts[0] =~ /build\/$/ ) { print "Found a build package: $package\n\tfor $File::Find::name\n"; - - } - elsif ( $File::Find::name =~ /sql12\/test/ ) { - - # ignore test files during this pass - - } - elsif ( $File::Find::name =~ /sql12\/squirrelsql-test-utils/ ) { - - # ignore maven test utilities project - - } - elsif ( $File::Find::name =~ /sql12\/installer/ ) { - - # ignore installer project - - } - elsif ( $File::Find::name =~ /sql12\/update-site/ ) { - # ignore update-site project - } else { print "Unable to categorize package of file: $File::Find::name\n"; exit 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-12 23:20:27
|
Revision: 5721 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5721&view=rev Author: manningr Date: 2010-07-12 23:20:21 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Fix issue where package_map not properly populated due to last checkin. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-12 22:13:42 UTC (rev 5720) +++ trunk/mavenize/mavenize.pl 2010-07-12 23:20:21 UTC (rev 5721) @@ -308,11 +308,11 @@ if ( $_ !~ /\.java$/ ) { return; } - return if ( $File::Find::name =~ /sql12\/installer/ ); - return if ( $File::Find::name =~ /sql12\/squirrelsql-integration-environment/ ); - return if ( $File::Find::name =~ /sql12\/squirrelsql-test-utils/ ); - return if ( $File::Find::name =~ /sql12\/test/ ); - return if ( $File::Find::name =~ /sql12\/update-site/ ); + #return if ( $File::Find::name =~ /sql12\/installer/ ); + #return if ( $File::Find::name =~ /sql12\/squirrelsql-integration-environment/ ); + #return if ( $File::Find::name =~ /sql12\/squirrelsql-test-utils/ ); + #return if ( $File::Find::name =~ /sql12\/test/ ); + #return if ( $File::Find::name =~ /sql12\/update-site/ ); $package = getPackageFromFile($File::Find::name); @@ -341,7 +341,32 @@ elsif ( $parts[0] =~ /build\/$/ ) { print "Found a build package: $package\n\tfor $File::Find::name\n"; + + } + elsif ( $File::Find::name =~ /sql12\/test/ ) { + + # ignore test files during this pass + + } + elsif ( $File::Find::name =~ /sql12\/squirrelsql-test-utils/ ) { + + # ignore maven test utilities project + + } + elsif ( $File::Find::name =~ /sql12\/installer/ ) { + + # ignore installer project + + } + elsif ( $File::Find::name =~ /sql12\/update-site/ ) { + # ignore update-site project + + } + elsif ( $File::Find::name =~ /sql12\/squirrelsql-integration-environment/ ) { + + # ignore squirrelsql-integration-environment project + } else { print "Unable to categorize package of file: $File::Find::name\n"; exit 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-14 01:14:12
|
Revision: 5726 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5726&view=rev Author: manningr Date: 2010-07-14 01:14:06 +0000 (Wed, 14 Jul 2010) Log Message: ----------- moved root pom permanently. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-14 01:13:21 UTC (rev 5725) +++ trunk/mavenize/mavenize.pl 2010-07-14 01:14:06 UTC (rev 5726) @@ -130,9 +130,6 @@ # Begin working ################################################################################################# -# copy in the root pom - this pom builds all of SQuirreL -copyRootPom(); - # copy in the installer projects copyInstallerProjects(); @@ -475,16 +472,6 @@ return $package; } -sub copyRootPom { - print "Copying in root pom\n"; - `cp root-pom.xml $topDir/pom.xml`; - return if $onlyCopyPoms; - `svn add $topDir/pom.xml`; - - setSvnIgnore($topDir); - chdirOrDie($mavenizeDir); -} - sub restructureFwModule { print "Restructuring fw module\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-17 15:50:38
|
Revision: 5732 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5732&view=rev Author: manningr Date: 2010-07-17 15:50:31 +0000 (Sat, 17 Jul 2010) Log Message: ----------- Fixed problem where test files were not being moved to src/test/java tree. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-17 15:25:42 UTC (rev 5731) +++ trunk/mavenize/mavenize.pl 2010-07-17 15:50:31 UTC (rev 5732) @@ -423,9 +423,11 @@ } elsif ( $category eq 'plugin' ) { - print "relativeDir: $relativeDir\n"; - @parts = split /plugins\//, $relativeDir; - $pluginName = $parts[1]; + print "relativeDir: $relativeDir\n"; + @parts = split /\/plugins\//, $relativeDir; + @parts = split /\//, $parts[1]; + $pluginName = $parts[0]; + if ( !defined $pluginName ) { # Hack : currently, only firebird tests have a package which doesn't contain the "plugins" package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-17 17:51:02
|
Revision: 5734 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5734&view=rev Author: manningr Date: 2010-07-17 17:50:54 +0000 (Sat, 17 Jul 2010) Log Message: ----------- Relocate documentation files by moving the entire directory. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-17 17:44:05 UTC (rev 5733) +++ trunk/mavenize/mavenize.pl 2010-07-17 17:50:54 UTC (rev 5734) @@ -290,8 +290,13 @@ if ( -d "$File::Find::dir/doc" ) { findAndCopyDoc($File::Find::dir); + } + if ( -d "$File::Find::dir/lib" ) { + `svn delete "$File::Find::dir/lib"`; + } + chdir($File::Find::dir) or die "Couldn't change dir back to $File::Find::dir: $!\n"; } } @@ -605,11 +610,11 @@ return if $onlyCopyPoms; my $baseDir = shift; - print -"findAndCopyDoc: moving documentation files from $baseDir/doc/... to $baseDir/src/main/resources/doc...\n"; - chdir("$baseDir/doc") or die "findAndCopyDoc: Couldn't chdir to $baseDir: $!\n"; -`find . -type f -printf "%h\n" | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents $baseDir/src/main/resources/doc/{}`; -`find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; + print "findAndCopyDoc: moving documentation files from $baseDir/doc/... to $baseDir/src/main/resources/doc...\n"; + #chdir("$baseDir/doc") or die "findAndCopyDoc: Couldn't chdir to $baseDir: $!\n"; + #`find . -type f -printf "%h\n" | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents $baseDir/src/main/resources/doc/{}`; + #`find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; + `svn move $baseDir/doc $baseDir/src/main/resources`; } sub copyInstallerProjects { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-18 14:03:38
|
Revision: 5739 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5739&view=rev Author: manningr Date: 2010-07-18 14:03:32 +0000 (Sun, 18 Jul 2010) Log Message: ----------- Ensure that macosx plugin's src/main/resources directory has been added prior to moving doc folder there. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-18 02:15:18 UTC (rev 5738) +++ trunk/mavenize/mavenize.pl 2010-07-18 14:03:32 UTC (rev 5739) @@ -39,7 +39,9 @@ $macDir = $topDir . "/mac"; $onlyCopyPoms = 0; +%svnmkdirpaths = ( "paths that have already been " => " passed to svnmkdir"); + $cache_deps = <<"EOF"; <dependency> <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> @@ -450,8 +452,13 @@ sub svnmkdir { my $absolutepath = shift; - `svn mkdir --parents $absolutepath`; - + if (exists($svnmkdirpaths{$absolutepath})) { + return; + } else { + print "svnmkdir: $absolutepath\n"; + `svn mkdir --parents $absolutepath`; + $svnmkdirpaths{$absolutepath} = "added"; + } } sub getPackageFromFile { @@ -611,9 +618,11 @@ my $baseDir = shift; print "findAndCopyDoc: moving documentation files from $baseDir/doc/... to $baseDir/src/main/resources/doc...\n"; + #chdir("$baseDir/doc") or die "findAndCopyDoc: Couldn't chdir to $baseDir: $!\n"; #`find . -type f -printf "%h\n" | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents $baseDir/src/main/resources/doc/{}`; #`find . -type f -print | grep -v "^./main/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} $baseDir/src/main/resources/doc/{}`; + svnmkdir("$baseDir/src/main/resources"); `svn move $baseDir/doc $baseDir/src/main/resources`; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-18 18:55:16
|
Revision: 5742 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5742&view=rev Author: manningr Date: 2010-07-18 18:55:10 +0000 (Sun, 18 Jul 2010) Log Message: ----------- Switched the order of sort and uniq as according to the man page for uniq, it will only collapse duplicate lines if they are adjacent. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-18 18:54:24 UTC (rev 5741) +++ trunk/mavenize/mavenize.pl 2010-07-18 18:55:10 UTC (rev 5742) @@ -598,19 +598,19 @@ sub findAndCopyJava { return if $onlyCopyPoms; print "Copying source files from src/... to /src/main/java...\n"; -`find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn mkdir --parents ./main/java/{}`; +`find . -name *.java -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn mkdir --parents ./main/java/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; -`find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | sort | xargs -ti svn move {} ./main/java/{}`; +`find . -type f -name *.java -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn move {} ./main/java/{}`; } sub findAndCopyResources { return if $onlyCopyPoms; my $fileType = shift; -`find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn mkdir --parents main/resources/{}`; +`find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn mkdir --parents main/resources/{}`; `svn add --quiet main`; `find main -type d | grep -v .svn | sort | xargs -ti svn add --quiet {}`; -`find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti svn move {} main/resources/{}`; +`find . -type f -name $fileType -print | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | sort | uniq | xargs -ti svn move {} main/resources/{}`; } sub findAndCopyDoc { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-07-21 00:00:56
|
Revision: 5746 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5746&view=rev Author: manningr Date: 2010-07-21 00:00:50 +0000 (Wed, 21 Jul 2010) Log Message: ----------- Be a little more efficient when adding a directory tree to subversion (if the dir has .svn directory under it, then it is already under subversion control). Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-07-20 22:44:58 UTC (rev 5745) +++ trunk/mavenize/mavenize.pl 2010-07-21 00:00:50 UTC (rev 5746) @@ -452,7 +452,7 @@ sub svnmkdir { my $absolutepath = shift; - if (exists($svnmkdirpaths{$absolutepath})) { + if (exists($svnmkdirpaths{$absolutepath}) || -d "$absolutepath/.svn") { return; } else { print "svnmkdir: $absolutepath\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-08-01 22:19:09
|
Revision: 5758 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5758&view=rev Author: manningr Date: 2010-08-01 22:19:02 +0000 (Sun, 01 Aug 2010) Log Message: ----------- move images into place so that they get picked up by the installer. Eventually, we will probably want all files for this project in src/main/resources so that they are in one place. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-08-01 21:45:11 UTC (rev 5757) +++ trunk/mavenize/mavenize.pl 2010-08-01 22:19:02 UTC (rev 5758) @@ -719,11 +719,11 @@ return if $onlyCopyPoms; `svn add $websiteDir/pom.xml`; - `rm -rf $websiteDir/src/main`; - `mkdir -p $websiteDir/src/main/resources`; - `cp $websiteDir/faq.html $websiteDir/src/main/resources`; - `svn add $websiteDir/src`; + svnmkdir("$websiteDir/src/main/resources"); + `svn move $websiteDir/faq.html $websiteDir/src/main/resources`; + `svn move $websiteDir/images $websiteDir/src/main/resources`; + setSvnIgnore("$websiteDir"); chdirOrDie($mavenizeDir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-08-07 00:49:44
|
Revision: 5767 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5767&view=rev Author: manningr Date: 2010-08-07 00:49:38 +0000 (Sat, 07 Aug 2010) Log Message: ----------- Fix missing credits.html Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-08-07 00:44:59 UTC (rev 5766) +++ trunk/mavenize/mavenize.pl 2010-08-07 00:49:38 UTC (rev 5767) @@ -568,6 +568,7 @@ findAndCopyResources('*.png'); findAndCopyResources('*.xml'); findAndCopyResources('*.jpg'); + findAndCopyResources('*.html'); `cp $mavenizeDir/DefaultFormBuilder.java $appDir/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders`; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-08-08 13:05:04
|
Revision: 5770 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5770&view=rev Author: manningr Date: 2010-08-08 13:04:58 +0000 (Sun, 08 Aug 2010) Log Message: ----------- Copy in Version.java that contains the maven property squirrelsql.version. Modified Paths: -------------- trunk/mavenize/mavenize.pl Modified: trunk/mavenize/mavenize.pl =================================================================== --- trunk/mavenize/mavenize.pl 2010-08-08 13:01:36 UTC (rev 5769) +++ trunk/mavenize/mavenize.pl 2010-08-08 13:04:58 UTC (rev 5770) @@ -571,6 +571,8 @@ findAndCopyResources('*.html'); `cp $mavenizeDir/DefaultFormBuilder.java $appDir/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders`; + # Overwrite Version.java with the one that contains a maven property for version which gets filtered + `cp $mavenizeDir/Version.java $appDir/src/main/java/net/sourceforge/squirrel_sql/client/Version.java`; `svn delete net`; `svn add test`; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |