Skip to content

Commit

Permalink
rename x86-64 to correct arch-type 'x86-amd64'
Browse files Browse the repository at this point in the history
  • Loading branch information
nitram509 committed Jan 3, 2016
1 parent e43fd58 commit bf82c26
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Currently the following platforms and architectures are tested:
### Build native libs

The jbrotli-native Maven modules are configured to automatically be activated on your platform.
E.g. on Windows with a 64bit JDK the module 'win32-x86-64' will be picked up.
E.g. on Windows with a 64bit JDK the module 'win32-x86-amd64' will be picked up.
If you want to build the 32bit version on Windows, you also need the 32bit JDK installed
and to setup different ENV variables for your Windows SDK (or Visual Studio).
See build.bat files for more details.
Expand All @@ -105,7 +105,7 @@ Each native module contains a small build script.
E.g. for Windows 64bit, you may use this ...

```bash
cd jbrotli-native/win32-x86-64
cd jbrotli-native/win32-x86-amd64
build.bat
```

Expand All @@ -123,7 +123,7 @@ javah -v -d jbrotli-native/src/main/cpp -classpath jbrotli/target/classes com.me

Example for Linux 64bit
```bash
cd jbrotli-native/linux-x86-64
cd jbrotli-native/linux-x86-amd64
mvn install
cd ../..
mvn -pl jbrotli-native install
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jbrotli-native-linux-x86-64</artifactId>
<artifactId>jbrotli-native-linux-x86-amd64</artifactId>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
8 changes: 4 additions & 4 deletions jbrotli-native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
</profile>

<profile>
<id>win32-x86-64</id>
<id>win32-x86-amd64</id>
<activation>
<os>
<family>Windows</family>
<arch>amd64</arch>
</os>
</activation>
<modules>
<module>win32-x86-64</module>
<module>win32-x86-amd64</module>
</modules>
</profile>

Expand Down Expand Up @@ -73,15 +73,15 @@
</profile>

<profile>
<id>linux-x86-64</id>
<id>linux-x86-amd64</id>
<activation>
<os>
<family>unix</family>
<arch>amd64</arch>
</os>
</activation>
<modules>
<module>linux-x86-64</module>
<module>linux-x86-amd64</module>
</modules>
</profile>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>jbrotli-native-win32-x86-64</artifactId>
<artifactId>jbrotli-native-win32-x86-amd64</artifactId>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
4 changes: 2 additions & 2 deletions jbrotli-performance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>com.meteogroup.jbrotli</groupId>
<artifactId>jbrotli-native-win32-x86-64</artifactId>
<artifactId>jbrotli-native-win32-x86-amd64</artifactId>
<version>0.2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>com.meteogroup.jbrotli</groupId>
<artifactId>jbrotli-native-linux-x86-64</artifactId>
<artifactId>jbrotli-native-linux-x86-amd64</artifactId>
<version>0.2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions jbrotli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>com.meteogroup.jbrotli</groupId>
<artifactId>jbrotli-native-win32-x86-64</artifactId>
<artifactId>jbrotli-native-win32-x86-amd64</artifactId>
<version>0.2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>com.meteogroup.jbrotli</groupId>
<artifactId>jbrotli-native-linux-x86-64</artifactId>
<artifactId>jbrotli-native-linux-x86-amd64</artifactId>
<version>0.2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Expand Down

0 comments on commit bf82c26

Please sign in to comment.