directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r636011 - in /directory/sandbox/pamarcelot/trunks/apacheds-additional-installers: daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/ daemon/plugin/src/...
Date Tue, 11 Mar 2008 17:08:44 GMT
Author: pamarcelot
Date: Tue Mar 11 10:08:29 2008
New Revision: 636011

URL: http://svn.apache.org/viewvc?rev=636011&view=rev
Log:
Added a new debTarget for the amd64 architecture. Updated the DebInstallerCommand to be able
to use multiple architectures.

Modified:
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=636011&r1=636010&r2=636011&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Tue Mar 11 10:08:29 2008
@@ -254,7 +254,8 @@
             }
         }
 
-        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64"
)
+        if ( target.getOsName().equals( "linux" )
+            && ( target.getOsArch().equals( "x86_64" ) || target.getOsArch().equals(
"amd64" ) )
             && target.getDaemonFramework().equals( "tanuki" ) )
         {
             try

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java?rev=636011&r1=636010&r2=636011&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
Tue Mar 11 10:08:29 2008
@@ -238,6 +238,7 @@
         {
             filterProperties.put( "app.version", "1.0" );
         }
+        filterProperties.put( "arch", target.getOsArch());
     }
 
 

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control?rev=636011&r1=636010&r2=636011&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
Tue Mar 11 10:08:29 2008
@@ -2,7 +2,7 @@
 Version: ${version.debian}
 Section: devel
 Priority: optional
-Architecture: i386
+Architecture: ${arch}
 Depends: 
 Installed-Size: 9318
 Maintainer: Apache Directory Project <dev@directory.apache.org>

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml?rev=636011&r1=636010&r2=636011&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
Tue Mar 11 10:08:29 2008
@@ -380,11 +380,19 @@
               </applicationClass>
               <debTargets>
                 <debTarget>
-                 <id>apacheds-debian</id>
-                  <finalName>apacheds-debian</finalName>
+                 <id>apacheds-debian-i386</id>
+                  <finalName>apacheds-debian-i386</finalName>
                   <osName>linux</osName>
                   <osFamily>linux</osFamily>
                   <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </debTarget>
+                <debTarget>
+                 <id>apacheds-debian-amd64</id>
+                  <finalName>apacheds-debian-amd64</finalName>
+                  <osName>linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>amd64</osArch>
                   <daemonFramework>tanuki</daemonFramework>
                 </debTarget>
               </debTargets>



Mime
View raw message