From commits-return-17395-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Mar 11 17:09:12 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52242 invoked from network); 11 Mar 2008 17:09:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Mar 2008 17:09:11 -0000 Received: (qmail 92899 invoked by uid 500); 11 Mar 2008 17:09:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 92857 invoked by uid 500); 11 Mar 2008 17:09:08 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 92846 invoked by uid 99); 11 Mar 2008 17:09:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2008 10:09:08 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2008 17:08:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC18D1A9832; Tue, 11 Mar 2008 10:08:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080311170847.CC18D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 @@ - apacheds-debian - apacheds-debian + apacheds-debian-i386 + apacheds-debian-i386 linux linux i386 + tanuki + + + apacheds-debian-amd64 + apacheds-debian-amd64 + linux + linux + amd64 tanuki