You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/02 09:56:29 UTC
svn commit: r374310 -
/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Author: akarasulu
Date: Thu Feb 2 00:56:27 2006
New Revision: 374310
URL: http://svn.apache.org/viewcvs?rev=374310&view=rev
Log:
including the apacheds-tools.sh in the image for rpm builds
Modified:
directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=374310&r1=374309&r2=374310&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java (original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java Thu Feb 2 00:56:27 2006
@@ -125,7 +125,25 @@
// Step 2 & 3: copy rpm spec file and filter
// -------------------------------------------------------------------
- // check first to see if the default install.iss file is present in src/main/installers
+ /** HACK!
+ * @todo clean me up
+ * @see http://issues.apache.org/jira/browse/DIREVE-333
+ */
+ File toolsSource = new File( this.mymojo.getSourceDirectory(), "apacheds-tools.sh" );
+ File toolsTarget = new File( target.getLayout().getBinDirectory(), "apacheds-tools.sh" );
+ try
+ {
+ MojoHelperUtils.copyAsciiFile( mymojo, filterProperties,
+ toolsSource, toolsTarget, true );
+ }
+ catch ( IOException e )
+ {
+ mymojo.getLog().error( "Failed to copy apacheds-tools.sh file "
+ + toolsSource
+ + " into position " + toolsTarget, e );
+ }
+
+ // check first to see if the default spec file is present in src/main/installers
File projectRpmFile = new File( mymojo.getSourceDirectory(), "spec.template" );
if ( target.getRpmSpecificationFile() != null && target.getRpmSpecificationFile().exists() )
{