|
From: Rob M. <man...@us...> - 2009-11-20 01:29:31
|
Update of /cvsroot/squirrel-sql/mavenize In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10769 Modified Files: mavenize.pl Log Message: removed isqlj plugin, added support for update-site project. Fixed groupIds for external artifacts. Index: mavenize.pl =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mavenize.pl 26 Sep 2009 17:52:49 -0000 1.11 --- mavenize.pl 20 Nov 2009 01:29:23 -0000 1.12 *************** *** 54,66 **** </dependencies> EOF - $isqlj_deps = <<"EOF"; - <dependencies> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>isqlj</artifactId> - <version>1.8</version> - </dependency> - </dependencies> - EOF $oracle_deps = <<"EOF"; <dependencies> --- 54,57 ---- *************** *** 94,102 **** <version>1.2</version> </dependency> - <dependency> - <groupId>com.techtrader</groupId> - <artifactId>tt-bytecode</artifactId> - <version>1.0</version> - </dependency> </dependencies> EOF --- 85,88 ---- *************** *** 104,135 **** <dependencies> <dependency> ! <groupId>org.netbeans</groupId> <artifactId>openide</artifactId> ! <version>041121</version> </dependency> <dependency> ! <groupId>org.netbeans</groupId> <artifactId>org-netbeans-modules-editor</artifactId> ! <version>041121</version> </dependency> <dependency> ! <groupId>org.netbeans</groupId> <artifactId>org-netbeans-modules-editor-fold</artifactId> ! <version>041121</version> </dependency> <dependency> ! <groupId>org.netbeans</groupId> <artifactId>org-netbeans-modules-editor-lib</artifactId> ! <version>041121</version> </dependency> <dependency> ! <groupId>org.netbeans</groupId> <artifactId>org-netbeans-modules-editor-util</artifactId> ! <version>041121</version> </dependency> <dependency> ! <groupId>com.ostermiller</groupId> ! <artifactId>syntax</artifactId> ! <version>1.0</version> </dependency> </dependencies> --- 90,121 ---- <dependencies> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>openide</artifactId> ! <version>4.0</version> </dependency> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>org-netbeans-modules-editor</artifactId> ! <version>4.0</version> </dependency> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>org-netbeans-modules-editor-fold</artifactId> ! <version>4.0</version> </dependency> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>org-netbeans-modules-editor-lib</artifactId> ! <version>4.0</version> </dependency> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> <artifactId>org-netbeans-modules-editor-util</artifactId> ! <version>4.0</version> </dependency> <dependency> ! <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> ! <artifactId>ostermiller-syntax</artifactId> ! <version>1.1.1</version> </dependency> </dependencies> *************** *** 155,158 **** --- 141,147 ---- copyTranslationProjects(); + # copy in the update site projects + copyUpdateSiteProjects(); + # restructure fw module restructureFwModule(); *************** *** 257,260 **** --- 246,256 ---- close(POMFILE); + # This is painful to do, but InterSystems leaves me with little choice. Remove Cache plugin from + # the plugin modules pom so that it doesn't get picked up or deployed. Perhaps we should think about + # using reflection for this instead. + if ($artifactId =~ 'cache' ) { + pop @artifacts; + } + !$onlyCopyPoms && `svn add $newPomFile`; } *************** *** 286,291 **** --- 282,292 ---- findAndCopyResources('*.png'); + !$onlyCopyPoms && `svn remove net`; + chdir($File::Find::dir) or die "Couldn't change dir back to $File::Find::dir: $!\n"; + #`svn remove plugin_build.xml`; + !$onlyCopyPoms && `svn propset --file $mavenizeDir/svn.ignore.prop`; + if ( -d "$File::Find::dir/doc" ) { findAndCopyDoc($File::Find::dir); *************** *** 350,354 **** } ! else { print "Unable to categorize package of file: $File::Find::name\n"; exit 1; --- 351,359 ---- } ! 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; *************** *** 664,667 **** --- 669,694 ---- } + 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`; + + `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/`; + + return if $onlyCopyPoms; + + `svn add $topDir/update-site/pom.xml`; + `svn add $topDir/update-site/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`; + } + sub restructureDocModule { |
