directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376241 - /directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Date Thu, 09 Feb 2006 09:49:28 GMT
Author: akarasulu
Date: Thu Feb  9 01:49:25 2006
New Revision: 376241

URL: http://svn.apache.org/viewcvs?rev=376241&view=rev
Log:
fixes for rpm generation

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=376241&r1=376240&r2=376241&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  9 01:49:25 2006
@@ -362,7 +362,9 @@
             }
             
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/" );
+            buf.append( "mkdir -p $RPM_BUILD_ROOT/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }
@@ -387,7 +389,9 @@
             }
             
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "mkdir -p $RPM_BUILD_ROOT/usr/local/${app}-%{version}/" );
+            buf.append( "mkdir -p $RPM_BUILD_ROOT/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }
@@ -433,9 +437,12 @@
             }
             
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "install -m 644 ${image.basedir}/" );
+            buf.append( "install -m 644 " );
+            buf.append( target.getLayout().getBaseDirectory() ).append( "/" );
             buf.append( path );
-            buf.append( " $RPM_BUILD_ROOT/usr/local/${app}-%{version}/" );
+            buf.append( " $RPM_BUILD_ROOT/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }
@@ -455,7 +462,9 @@
         {
             File file = ( File ) docList.get( ii );
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "/usr/local/${app}-%{version}/" );
+            buf.append( "/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }
@@ -480,9 +489,12 @@
             }
             
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "install -m 644 ${image.basedir}/" );
+            buf.append( "install -m 644 " );
+            buf.append( target.getLayout().getBaseDirectory() ).append( "/" );
             buf.append( path );
-            buf.append( " $RPM_BUILD_ROOT/usr/local/${app}-%{version}/" );
+            buf.append( " $RPM_BUILD_ROOT/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }
@@ -502,7 +514,9 @@
         {
             File file = ( File ) sourceList.get( ii );
             String path = file.getAbsolutePath().substring( basePathSize );
-            buf.append( "/usr/local/${app}-%{version}/" );
+            buf.append( "/usr/local/" );
+            buf.append( target.getApplication().getName() );
+            buf.append( "-%{version}/" );
             buf.append( path );
             buf.append( "\n" );
         }



Mime
View raw message