Update of /cvsroot/squirrel-sql/mavenize
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28270
Modified Files:
mavenize.pl
Log Message:
Corrected missing svn adds.
Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mavenize.pl 4 Sep 2009 23:28:02 -0000 1.7
--- mavenize.pl 7 Sep 2009 14:14:06 -0000 1.8
***************
*** 140,143 ****
--- 140,144 ----
# copy in the root pom - this pom builds all of SQuirreL
`cp root-pom.xml $topDir/pom.xml`;
+ `svn add $topDir/pom.xml`;
# copy in the test utilities project - I nix'd this since there were dependency issues
***************
*** 203,208 ****
$pluginDescription = $pluginName;
! print
! "Creating new pom: $newPomFile \n\t artifactId=$artifactId \n\t name=$pluginName \n\t description=$pluginDescription\n";
if ( $artifactId =~ 'cache' ) {
--- 204,211 ----
$pluginDescription = $pluginName;
! print "Creating new pom: $newPomFile \n"
! . "\t artifactId=$artifactId \n"
! . "\t name=$pluginName \n"
! . "\t description=$pluginDescription\n";
if ( $artifactId =~ 'cache' ) {
***************
*** 246,253 ****
close(POMFILE);
}
sub wanted_for_source {
! if ( $_ =~ /^plugin_build.xml$/) {
chdir('./src') or die "Couldn't change to src directory in $File::Find::dir : $!\n";
--- 249,257 ----
close(POMFILE);
+ `svn add $newPomFile`;
}
sub wanted_for_source {
! if ( $_ =~ /^plugin_build.xml$/ ) {
chdir('./src') or die "Couldn't change to src directory in $File::Find::dir : $!\n";
***************
*** 290,297 ****
return;
}
!
$package = getPackageFromFile($File::Find::name);
! print "wanted_for_packagemap: javafile: $_ (package=$package)\n";
@parts = split /src/, $File::Find::name;
--- 294,301 ----
return;
}
!
$package = getPackageFromFile($File::Find::name);
! print "wanted_for_packagemap: javafile: $_ (package=$package)\n";
@parts = split /src/, $File::Find::name;
***************
*** 347,354 ****
return;
}
!
$package = getPackageFromFile($File::Find::name);
! print "wanted_for_testsources: \$_= $_ filename=$File::Find::name | package=$package\n";
$category = $packagemap->{$package};
--- 351,358 ----
return;
}
!
$package = getPackageFromFile($File::Find::name);
! print "wanted_for_testsources: \$_= $_ filename=$File::Find::name | package=$package\n";
$category = $packagemap->{$package};
***************
*** 404,408 ****
print "pluginName: $pluginName\n";
-
svnmkdir("$pluginsDir/$pluginName/src/test/java/$relativeDir");
`svn add $pluginsDir/$pluginName/src/test`;
--- 408,411 ----
***************
*** 414,431 ****
sub svnmkdir {
my $absolutepath = shift;
!
`svn mkdir --parents $absolutepath`;
!
! # my @parts = split /\//, $absolutepath;
! #
! # my $curpath;
! # for $part (@parts) {
! # $curpath .= $part . '/';
! # if (! -e $curpath) {
! # print "Path: $curpath doesn't exist. Creating it with SVN\n";
! # `svn mkdir --quiet $curpath`;
! # }
! # }
!
}
--- 417,434 ----
sub svnmkdir {
my $absolutepath = shift;
!
`svn mkdir --parents $absolutepath`;
!
! # my @parts = split /\//, $absolutepath;
! #
! # my $curpath;
! # for $part (@parts) {
! # $curpath .= $part . '/';
! # if (! -e $curpath) {
! # print "Path: $curpath doesn't exist. Creating it with SVN\n";
! # `svn mkdir --quiet $curpath`;
! # }
! # }
!
}
***************
*** 488,492 ****
--- 491,497 ----
`cp $mavenizeDir/fw-pom.xml $fwDir/pom.xml`;
+ `svn add $fwDir/pom.xml`;
`cp $mavenizeDir/test-log4j.properties $fwDir/src/test/resources/log4j.properties`;
+ `svn add $fwDir/src/test/resources/log4j.properties`;
chdir("$fwDir/src") or die "Couldn't change directory to $fwDir/src: $!\n";
***************
*** 515,518 ****
--- 520,524 ----
`cp app-pom.xml $appDir/pom.xml`;
+ `svn add $appDir/pom.xml`;
svnmkdir("$appDir/src/main/java");
svnmkdir("$appDir/src/main/resources");
***************
*** 539,564 ****
sub findAndCopyJava {
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/{}`;
`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/{}`;
}
sub findAndCopyResources {
my $fileType = shift;
! `find . -name $fileType -printf "%h\n" | grep -v "^./main/" | grep -v "^./test/" | grep -v ".svn" | uniq | xargs -ti mkdir -p 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/{}`;
}
sub findAndCopyDoc {
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 -i mkdir -p $baseDir/src/main/resources/doc/{}`;
! `svn add $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/{}`;
}
--- 545,568 ----
sub findAndCopyJava {
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/{}`;
`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/{}`;
}
sub findAndCopyResources {
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/{}`;
`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/{}`;
}
sub findAndCopyDoc {
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/{}`;
}
***************
*** 587,596 ****
print "Copying in translations project\n";
`rm -rf $topDir/squirrelsql-translations`;
! `cp -r $mavenizeDir/squirrelsql-translations $topDir`;
! chdir($topDir);
! `svn add squirrelsql-translations`;
chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
}
--- 591,608 ----
print "Copying in translations project\n";
`rm -rf $topDir/squirrelsql-translations`;
! `svn mkdir --parents $topDir/squirrelsql-translations/src/main/resources`;
! `cp $mavenizeDir/squirrelsql-translations/pom.xml $topDir/squirrelsql-translations`;
! `svn add $topDir/squirrelsql-translations/pom.xml`;
! chdir("$topDir/translations") or die "Couldn't change directory to $topDir/translations: $!\n";
!
! `find . -name "*.jar" | xargs -ti svn move {} $topDir/squirrelsql-translations/src/main/resources`;
!
! chdir("$topDir") or die "Couldn't change directory to $topDir: $!\n";
!
! `svn remove translations`;
chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
+
}
***************
*** 621,628 ****
print "Restructuring web-site module\n";
`cp $mavenizeDir/website-pom.xml $websiteDir/pom.xml`;
`rm -rf $websiteDir/src/main`;
`mkdir -p $websiteDir/src/main/resources`;
`cp $websiteDir/faq.html $websiteDir/src/main/resources`;
!
}
--- 633,641 ----
print "Restructuring web-site module\n";
`cp $mavenizeDir/website-pom.xml $websiteDir/pom.xml`;
+ `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`;
}
***************
*** 657,669 ****
print MODULEPOMFILE $plugin_module_pom_template->fill_in();
close(MODULEPOMFILE);
}
sub installLafPluginAssembly {
! my $lafPluginAssemblyFile = "$mavenizeDir/laf-plugin/laf-plugin-assembly.xml";
! my $targetFolder = "$lafPluginDir/src/main/resources/assemblies";
print "Installing L&F Plugin Assembly ($lafPluginAssemblyFile) in $targetFolder\n";
! `mkdir -p $lafPluginDir/src/main/resources/assemblies`;
`cp $lafPluginAssemblyFile $targetFolder`;
chdir($lafPluginDir) or die "Couldn't change dir to ($lafPluginDir): $!\n";
}
--- 670,687 ----
print MODULEPOMFILE $plugin_module_pom_template->fill_in();
close(MODULEPOMFILE);
+
+ `svn add $modulespomfile`;
}
sub installLafPluginAssembly {
! my $lafPluginAssemblyFile = "$mavenizeDir/laf-plugin/laf-plugin-assembly.xml";
! my $targetFolder = "$lafPluginDir/src/main/resources/assemblies";
print "Installing L&F Plugin Assembly ($lafPluginAssemblyFile) in $targetFolder\n";
! `svn mkdir --parents $targetFolder`;
`cp $lafPluginAssemblyFile $targetFolder`;
+ `svn add $lafPluginDir/src`;
+ `svn add $lafPluginDir/pom.xml`;
+ `svn add $targetFolder/laf-plugin-assembly.xml`;
chdir($lafPluginDir) or die "Couldn't change dir to ($lafPluginDir): $!\n";
}
|
