directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376532 - in /directory/trunks/daemon/installers-plugin/src/main: java/org/apache/directory/daemon/installers/ java/org/apache/directory/daemon/installers/inno/ java/org/apache/directory/daemon/installers/rpm/ resources/org/apache/directory...
Date Fri, 10 Feb 2006 02:29:42 GMT
Author: akarasulu
Date: Thu Feb  9 18:29:42 2006
New Revision: 376532

URL: http://svn.apache.org/viewcvs?rev=376532&view=rev
Log:
added notice file to the distributions

Modified:
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=376532&r1=376531&r2=376532&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Thu Feb  9 18:29:42 2006
@@ -396,5 +396,22 @@
                     + " to " + docsDirectory );
             }
         }
+        
+        // -- if present copy the NOTICE.txt file --
+        
+        File noticeFileTarget = new File ( layout.getBaseDirectory(), "NOTICE.txt" );
+        File noticeFile = new File ( "NOTICE.txt" );
+        if ( noticeFile.exists() )
+        {
+            try
+            {
+                FileUtils.copyFile( noticeFile, noticeFileTarget );
+            }
+            catch ( IOException e )
+            {
+                mymojo.getLog().error( "Failed to notice file "  + noticeFile.getAbsolutePath()
+                    + " into position " + noticeFileTarget.getAbsolutePath(), e );
+            }
+        }
     }
 }

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java?rev=376532&r1=376531&r2=376532&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java
Thu Feb  9 18:29:42 2006
@@ -263,6 +263,17 @@
         {
         	filterProperties.put( "sources.directive", "" );
         }
+        
+        File noticeFile = new File( target.getLayout().getBaseDirectory(), "NOTICE.txt" );
+        if ( noticeFile.exists() )
+        {
+            filterProperties.put( "notice.file", "Source: {#SourceBase}\\NOTICE.txt; DestDir:
" +
+                    "{app}\\; Flags: ignoreversion recursesubdirs createallsubdirs" );
+        }
+        else
+        {
+            filterProperties.put( "notice.file", "" );
+        }
     }
     
     

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=376532&r1=376531&r2=376532&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 18:29:42 2006
@@ -342,6 +342,19 @@
             filterProperties.put( "install.sources", "" );
             filterProperties.put( "verify.sources", "" );
         }
+
+        File noticeFile = new File( target.getLayout().getBaseDirectory(), "NOTICE.txt" );
+        if ( noticeFile.exists() )
+        {
+            filterProperties.put( "install.notice.file", "install -m 644 "
+                + target.getLayout().getBaseDirectory() + "/NOTICE.txt $RPM_BUILD_ROOT/usr/local/${app}-%{version}"
);
+            filterProperties.put( "verify.notice.file", "/usr/local/${app}-%{version}/NOTICE.txt"
);
+        }
+        else
+        {
+            filterProperties.put( "install.notice.file", "" );
+            filterProperties.put( "verify.notice.file", "" );
+        }
     }
     
     

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss?rev=376532&r1=376531&r2=376532&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
Thu Feb  9 18:29:42 2006
@@ -65,6 +65,7 @@
 ${app.lib.jars}
 ${docs.directive}
 ${sources.directive}
+${notice.file}
 
 [Icons]
 Name: {group}\Service Settings; Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app};
IconIndex: 0

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template?rev=376532&r1=376531&r2=376532&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/spec.template
Thu Feb  9 18:29:42 2006
@@ -55,6 +55,7 @@
 ${install.append.libs}
 ${install.docs}
 ${install.sources}
+${install.notice.file}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,4 +86,4 @@
 ${verify.append.libs}
 ${verify.docs}
 ${verify.sources}
-
+${verify.notice.file}



Mime
View raw message