|
From: <man...@us...> - 2010-07-10 21:58:42
|
Revision: 5682
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5682&view=rev
Author: manningr
Date: 2010-07-10 21:58:36 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Removed no longer required update-site module pom and removed the maven plugins from the mavenize script now that they have their own workspace.
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
trunk/mavenize/root-pom.xml
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-10 21:54:54 UTC (rev 5681)
+++ trunk/mavenize/mavenize.pl 2010-07-10 21:58:36 UTC (rev 5682)
@@ -186,7 +186,7 @@
removeRemainingUnnecessaryFiles();
-copyVersionPluginProject();
+#copyVersionPluginProject();
# End of script; Begin Subroutines
@@ -766,46 +766,52 @@
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/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/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/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`;
+ #`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`;
- setSvnIgnore("$topDir/update-site");
- setSvnIgnore("$topDir/update-site/squirrelsql-update-site");
- setSvnIgnore("$topDir/update-site/squirrelsql-update-site-plugin");
+ #`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";
+#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");
+#}
- 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";
Modified: trunk/mavenize/root-pom.xml
===================================================================
--- trunk/mavenize/root-pom.xml 2010-07-10 21:54:54 UTC (rev 5681)
+++ trunk/mavenize/root-pom.xml 2010-07-10 21:58:36 UTC (rev 5682)
@@ -121,11 +121,10 @@
<module>app</module>
<module>plugins</module>
<module>squirrelsql-translations</module>
- <module>squirrelsql-version-plugin</module>
<module>doc</module>
<module>web-site</module>
<module>installer</module>
- <module>update-site</module>
+ <module>squirrelsql-update-site</module>
</modules>
</profile>
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
