You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/09/22 19:04:29 UTC
svn commit: r1000090 - in /directory/apacheds/branches/apacheds-apacheds-2.0:
apacheds-installers/pom.xml
installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
Author: pamarcelot
Date: Wed Sep 22 17:04:29 2010
New Revision: 1000090
URL: http://svn.apache.org/viewvc?rev=1000090&view=rev
Log:
Added a new target for Mac OS X x86_64 (for the 64 bit JVM in Snow Leopard).
Modified:
directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml?rev=1000090&r1=1000089&r2=1000090&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/apacheds-installers/pom.xml Wed Sep 22 17:04:29 2010
@@ -60,11 +60,17 @@
<!-- Targets for Mac OS X .pkg installer package -->
<macOsXPkgTargets>
<macOsXPkgTarget>
- <id>apacheds-macosx</id>
- <finalName>apacheds-${version}.dmg</finalName>
+ <id>apacheds-macosx-x86</id>
+ <finalName>apacheds-x86-${version}.dmg</finalName>
<osName>Mac OS X</osName>
<osArch>x86</osArch>
</macOsXPkgTarget>
+ <macOsXPkgTarget>
+ <id>apacheds-macosx-x86_64</id>
+ <finalName>apacheds-x86_64-${version}.dmg</finalName>
+ <osName>Mac OS X</osName>
+ <osArch>x86_64</osArch>
+ </macOsXPkgTarget>
</macOsXPkgTargets>
</configuration>
Modified: directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java?rev=1000090&r1=1000089&r2=1000090&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java (original)
+++ directory/apacheds/branches/apacheds-apacheds-2.0/installers-plugin/src/main/java/org/apache/directory/daemon/installers/AbstractMojoCommand.java Wed Sep 22 17:04:29 2010
@@ -184,8 +184,8 @@ public abstract class AbstractMojoComman
private void copyWrapperFiles( InstallationLayout installationLayout, InstanceLayout instanceLayout )
throws MojoFailureException
{
- // Mac OS X
- if ( target.isOsNameMacOSX() )
+ // Mac OS X x86
+ if ( target.isOsNameMacOSX() && target.isOsArchx86() )
{
try
{
@@ -203,6 +203,25 @@ public abstract class AbstractMojoComman
}
}
+ // Mac OS X x86_64
+ if ( target.isOsNameMacOSX() && target.isOsArchX86_64() )
+ {
+ try
+ {
+ MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+ "/org/apache/directory/daemon/installers/wrapper/bin/wrapper-macosx-universal-64" ), new File(
+ installationLayout.getBinDirectory(), "wrapper" ) );
+ MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+ "/org/apache/directory/daemon/installers/wrapper/lib/libwrapper-macosx-universal-64.jnilib" ),
+ new File( installationLayout.getLibDirectory(),
+ "libwrapper.jnilib" ) );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoFailureException( "Failed to copy Tanuki binary files to lib and bin directories" );
+ }
+ }
+
// Linux i386 & x86
if ( target.isOsNameLinux() && ( target.isOsArchI386() || target.isOsArchx86() ) )
{