Skip to content

Commit

Permalink
fixed site build
Browse files Browse the repository at this point in the history
  • Loading branch information
hboutemy committed Dec 5, 2017
1 parent 14f1d05 commit 2e99592
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
8 changes: 5 additions & 3 deletions hawtjni-website/ext/Website.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ object Website {
val project_forums_url= "http://groups.google.com/group/hawtjni"
val project_wiki_url= "https://github.com/fusesource/hawtjni/wiki"
val project_logo= "/images/project-logo.png"
val project_version= "1.14"
val project_snapshot_version= "1.15-SNAPSHOT"
val project_version= "1.16"
val project_snapshot_version= "1.16-SNAPSHOT"
val project_versions = List(
project_version,
"1.15",
"1.14",
"1.13",
"1.12",
"1.11",
Expand All @@ -64,5 +66,5 @@ object Website {
val project_maven_groupId= "org.fusesource.hawtjni"
val project_maven_artifactId= "hawtjni-runtime"

val website_base_url= "http://hawtjni.fusesource.org"
val website_base_url= "http://fusesource.github.io/hawtjni/"
}
2 changes: 1 addition & 1 deletion hawtjni-website/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.fusesource.hawtjni</groupId>
<artifactId>hawtjni-project</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-SNAPSHOT</version>
</parent>

<artifactId>hawtjni-website</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions hawtjni-website/src/community/building.page
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies between modules.

### Maven options

To build ${project_name} maven has to be configured to use more memory
To build ${project_name} Maven has to be configured to use more memory

set MAVEN_OPTS=-Xmx512m -XX:MaxPermSize=128m

Expand All @@ -61,7 +61,7 @@ test running phase and not the building part
### Using an IDE

If you prefer to use an IDE then you can auto-generate the IDE's project
files using maven plugins. e.g.
files using Maven plugins. e.g.

mvn eclipse:eclipse

Expand Down
2 changes: 1 addition & 1 deletion hawtjni-website/src/community/contributing.page
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ We really want you to get involved in the ${project_name} project, to
software - please do dive in and help!

Try surf the [documentation](../documentation/index.html) and website in
general - if somethings confusing or not clear, [let us
general - if something is confusing or not clear, [let us
know](index.html) or raise a [support request](support.html).

[Download](../download.html) the code and try it out and see what you think.
Expand Down
2 changes: 1 addition & 1 deletion hawtjni-website/src/community/source.page
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Get the latest source code

* [instructions to build #{project_name}](building.html)
* read the [documentation](../documentation/index.html)
* browse the [developer links and maven reports](developers.html)
* browse the [developer links and Maven reports](developers.html)



20 changes: 10 additions & 10 deletions hawtjni-website/src/documentation/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Maven integration:
* Generates an autoconf and msbuild projects for the the native library so it can be built on other platforms using the native toolchain.
* Native library is built before the test phase, so you can unit tests your JNI classes.
* Built native library is packaged as a jar resource and deployed to the maven repo for easy distribution of native code.
* Built native library is packaged as a jar resource and deployed to the Maven repo for easy distribution of native code.

## Getting Started with HawtJNI {#getting-started}

Expand Down Expand Up @@ -60,15 +60,15 @@ automatically unpack the native library from a jar resource and use that so that
you don't have to worry installing it to the java library path.

The HawtJNI build process will take care of implementing your `simple` jni library
by using some maven tooling which we will cover in the next example.
by using some Maven tooling which we will cover in the next example.

### Building with Maven

If you are not familiar with Maven, please checkout
[Maven by Example](http://www.sonatype.com/books/mvnex-book/reference/public-book.html).

The easiest way to get started with HawtJNI is copy and use
[the example maven project](http://github.com/fusersource/hawtjni/tree/master/hawtjni-example/) as a template for your module.
[the example Maven project](http://github.com/fusersource/hawtjni/tree/master/hawtjni-example/) as a template for your module.

At the root of the Maven project run:
{pygmentize:: text}
Expand Down Expand Up @@ -728,7 +728,7 @@ use HawtJNI to generate your JNI libraries. With the following steps:
<dependency>
<groupId>org.fusesource.hawtjni</groupId>
<artifactId>hawtjni-runtime</artifactId>
<version>{project_version:}</version>
<version>${project_version}</version>
</dependency>
...
</dependencies>
Expand All @@ -737,14 +737,14 @@ use HawtJNI to generate your JNI libraries. With the following steps:

2. Add the HawtJNI Maven plugin to the pom.
{pygmentize:: xml}
<pom>
<project>
<build>
<plugins>
...
<plugin>
<groupId>org.fusesource.hawtjni</groupId>
<artifactId>hawtjni-maven-plugin</artifactId><!-- was maven-hawtjni-plugin until 1.14 -->
<version>{project_version:}</version>
<artifactId>hawtjni-maven-plugin</artifactId><!-- was maven-hawtjni-plugin until 1.15 -->
<version>${project_version}</version>
<executions>
<execution>
<goals>
Expand All @@ -759,14 +759,14 @@ use HawtJNI to generate your JNI libraries. With the following steps:
...
</plugins>
</build>
<pom>
<project>
{pygmentize}

### Build Phases

You may have noticed that HawtJNI is generating a slew of code in different
directories. Here is a breakdown of what gets generated where and during which
maven build phase:
Maven build phase:

1. __process-classes__: Processes the annotated java classes:

Expand All @@ -786,7 +786,7 @@ maven build phase:
added as a test resource path.

3. __package-jar__: The contents of `target/generated-sources/hawtjni/lib` get
jarred and attached to the maven build with a platform specific classifier.
jarred and attached to the Maven build with a platform specific classifier.

4. __package-source__: The contents of
`target/generated-sources/hawtjni/native-package` get zipped up into a platform
Expand Down

0 comments on commit 2e99592

Please sign in to comment.