summaryrefslogtreecommitdiff
path: root/src/site
diff options
context:
space:
mode:
Diffstat (limited to 'src/site')
-rw-r--r--src/site/apt/HelloWorld.apt9
-rw-r--r--src/site/apt/aol.apt110
-rw-r--r--src/site/apt/configuration.apt2
-rw-r--r--src/site/apt/cpptasks.apt6
-rw-r--r--src/site/apt/faq.apt2
-rw-r--r--src/site/apt/intro.apt8
-rw-r--r--src/site/apt/lifecycle.apt2
-rw-r--r--src/site/apt/narDependencies.apt2
-rw-r--r--src/site/apt/narLibrary.apt13
-rw-r--r--src/site/apt/philosophy.apt8
-rw-r--r--src/site/apt/usage.apt17
-rw-r--r--src/site/site.xml42
12 files changed, 158 insertions, 63 deletions
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 90f5123..7d1f2aa 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -13,7 +13,7 @@ There are also some unit test which are run and call the same method.
The following examples are available:
- [helloworldexe] A C routine.
+ [executable] A C routine.
[helloworldstaticexe] A C routine statically linked with the C-runtime library.
@@ -53,9 +53,6 @@ There are also some unit test which are run and call the same method.
[]
- These examples are now all run as tests when you try to run maven on the freehep-nar-plugin from its top-level directory.
+ These examples are now all run as integration tests when you try to run maven on the maven-nar-plugin from its top-level directory with the profile "run-its".
- For the sources of these tests, see:
-{{{http://java.freehep.org/svn/repobrowser.svn?path=%2ffreehep%2ftrunk%2fmaven-plugins%2ffreehep-nar-plugin%2ftests&revision=HEAD&name=freehep&bypassEmpty=true}
-the SVN repository}}.
diff --git a/src/site/apt/aol.apt b/src/site/apt/aol.apt
index 0acaa96..8ce59f7 100644
--- a/src/site/apt/aol.apt
+++ b/src/site/apt/aol.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -11,6 +11,13 @@ AOL Properties
+--
#
+# AOL (Architecture-OperatingSystem-Linker) Default Values
+#
+# @author Mark Donszelmann
+# @version $Id$
+#
+
+#
# Windows ("Windows *" => Windows)
#
x86.Windows.linker=msvc
@@ -37,6 +44,7 @@ x86.Windows.msvc.java.include=include;include/win32
x86.Windows.msvc.java.runtimeDirectory=lib
x86.Windows.msvc.lib.prefix=
+x86.Windows.msvc.shared.prefix=
x86.Windows.msvc.shared.extension=dll
x86.Windows.msvc.static.extension=lib
x86.Windows.msvc.plugin.extension=dll
@@ -66,16 +74,23 @@ x86.Windows.g++.fortran.options=-Wall
x86.Windows.g++.fortran.includes=**/*.f **/*.for
x86.Windows.g++.fortran.excludes=
-x86.Windows.g++.java.include=include;include/Windows
+x86.Windows.g++.java.include=include;include/win32
x86.Windows.g++.java.runtimeDirectory=lib
x86.Windows.g++.lib.prefix=lib
+x86.Windows.g++.shared.prefix=
x86.Windows.g++.static.extension=a
-x86.Windows.g++.shared.extension=so
-x86.Windows.g++.plugin.extension=so
-x86.Windows.g++.jni.extension=so
+x86.Windows.g++.shared.extension=dll
+x86.Windows.g++.plugin.extension=dll
+x86.Windows.g++.jni.extension=dll
x86.Windows.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+x86.Windows.gcc.static.extension=a
+x86.Windows.gcc.shared.extension=dll
+x86.Windows.gcc.plugin.extension=dll
+x86.Windows.gcc.jni.extension=dll
+
#
# Linux
#
@@ -103,12 +118,19 @@ i386.Linux.g++.java.include=include;include/linux
i386.Linux.g++.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.g++.lib.prefix=lib
+i386.Linux.g++.shared.prefix=lib
i386.Linux.g++.static.extension=a
i386.Linux.g++.shared.extension=so
i386.Linux.g++.plugin.extension=so
i386.Linux.g++.jni.extension=so
i386.Linux.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+i386.Linux.gcc.static.extension=a
+i386.Linux.gcc.shared.extension=so
+i386.Linux.gcc.plugin.extension=so
+i386.Linux.gcc.jni.extension=so
+
#i386.Linux.g++.arch.includes=lib/**/*.a lib/**/*.so
#
@@ -136,6 +158,7 @@ i386.Linux.icc.java.include=include;include/linux
i386.Linux.icc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.icc.lib.prefix=lib
+i386.Linux.icc.shared.prefix=lib
i386.Linux.icc.static.extension=a
i386.Linux.icc.shared.extension=so
i386.Linux.icc.plugin.extension=so
@@ -168,6 +191,7 @@ i386.Linux.icpc.java.include=include;include/linux
i386.Linux.icpc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.icpc.lib.prefix=lib
+i386.Linux.icpc.shared.prefix=lib
i386.Linux.icpc.static.extension=a
i386.Linux.icpc.shared.extension=so
i386.Linux.icpc.plugin.extension=so
@@ -200,6 +224,7 @@ i386.Linux.ecc.java.include=include;include/linux
i386.Linux.ecc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.ecc.lib.prefix=lib
+i386.Linux.ecc.shared.prefix=lib
i386.Linux.ecc.static.extension=a
i386.Linux.ecc.shared.extension=so
i386.Linux.ecc.plugin.extension=so
@@ -232,6 +257,7 @@ i386.Linux.ecpc.java.include=include;include/linux
i386.Linux.ecpc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.ecpc.lib.prefix=lib
+i386.Linux.ecpc.shared.prefix=lib
i386.Linux.ecpc.static.extension=a
i386.Linux.ecpc.shared.extension=so
i386.Linux.ecpc.plugin.extension=so
@@ -265,16 +291,23 @@ amd64.Linux.g++.java.include=include;include/linux
amd64.Linux.g++.java.runtimeDirectory=jre/lib/amd64/server
amd64.Linux.g++.lib.prefix=lib
+amd64.Linux.g++.shared.prefix=lib
amd64.Linux.g++.static.extension=a
amd64.Linux.g++.shared.extension=so
amd64.Linux.g++.plugin.extension=so
amd64.Linux.g++.jni.extension=so
amd64.Linux.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+amd64.Linux.gcc.static.extension=a
+amd64.Linux.gcc.shared.extension=so
+amd64.Linux.gcc.plugin.extension=so
+amd64.Linux.gcc.jni.extension=so
+
#amd64.Linux.g++.arch.includes=lib/**/*.a lib/**/*.so
#
-# MacOSX ("Mac OS X" => MacOSX)
+# MacOSX ("Mac OS X" => MacOSX) PowerPC
#
ppc.MacOSX.linker=g++
@@ -300,16 +333,23 @@ ppc.MacOSX.g++.java.include=include
ppc.MacOSX.g++.java.runtimeDirectory=IGNORED
ppc.MacOSX.g++.lib.prefix=lib
+ppc.MacOSX.g++.shared.prefix=lib
ppc.MacOSX.g++.static.extension=a
ppc.MacOSX.g++.shared.extension=dylib
ppc.MacOSX.g++.plugin.extension=bundle
ppc.MacOSX.g++.jni.extension=jnilib
ppc.MacOSX.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+ppc.MacOSX.gcc.static.extension=a
+ppc.MacOSX.gcc.shared.extension=dylib
+ppc.MacOSX.gcc.plugin.extension=bundle
+ppc.MacOSX.gcc.jni.extension=jnilib
+
#ppc.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
#
-# MacOSX ("Mac OS X" => MacOSX) Intel
+# MacOSX ("Mac OS X" => MacOSX) Intel (32 bits)
#
i386.MacOSX.linker=g++
@@ -335,15 +375,64 @@ i386.MacOSX.g++.java.include=include
i386.MacOSX.g++.java.runtimeDirectory=IGNORED
i386.MacOSX.g++.lib.prefix=lib
+i386.MacOSX.g++.shared.prefix=lib
i386.MacOSX.g++.static.extension=a
i386.MacOSX.g++.shared.extension=dylib
i386.MacOSX.g++.plugin.extension=bundle
i386.MacOSX.g++.jni.extension=jnilib
i386.MacOSX.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+i386.MacOSX.gcc.static.extension=a
+i386.MacOSX.gcc.shared.extension=dylib
+i386.MacOSX.gcc.plugin.extension=bundle
+i386.MacOSX.gcc.jni.extension=jnilib
+
#i386.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
#
+# MacOSX ("Mac OS X" => MacOSX) Intel (64 bits)
+#
+x86_64.MacOSX.linker=g++
+
+x86_64.MacOSX.g++.cpp.compiler=g++
+x86_64.MacOSX.g++.cpp.defines=Darwin GNU_GCC
+x86_64.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+x86_64.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+x86_64.MacOSX.g++.cpp.excludes=
+
+x86_64.MacOSX.g++.c.compiler=gcc
+x86_64.MacOSX.g++.c.defines=Darwin GNU_GCC
+x86_64.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+x86_64.MacOSX.g++.c.includes=**/*.c
+x86_64.MacOSX.g++.c.excludes=
+
+x86_64.MacOSX.g++.fortran.compiler=gfortran
+x86_64.MacOSX.g++.fortran.defines=Darwin GNU_GCC
+x86_64.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore
+x86_64.MacOSX.g++.fortran.includes=**/*.f **/*.for
+x86_64.MacOSX.g++.fortran.excludes=
+
+x86_64.MacOSX.g++.java.include=include
+x86_64.MacOSX.g++.java.runtimeDirectory=IGNORED
+
+x86_64.MacOSX.g++.lib.prefix=lib
+x86_64.MacOSX.g++.shared.prefix=lib
+x86_64.MacOSX.g++.static.extension=a
+x86_64.MacOSX.g++.shared.extension=dylib
+x86_64.MacOSX.g++.plugin.extension=bundle
+x86_64.MacOSX.g++.jni.extension=jnilib
+x86_64.MacOSX.g++.executable.extension=
+
+# FIXME to be removed when NARPLUGIN-137
+x86_64.MacOSX.gcc.static.extension=a
+x86_64.MacOSX.gcc.shared.extension=dylib
+x86_64.MacOSX.gcc.plugin.extension=bundle
+x86_64.MacOSX.gcc.jni.extension=jnilib
+
+#x86_64.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
+
+#
# Solaris
#
sparc.SunOS.linker=CC
@@ -372,12 +461,19 @@ sparc.SunOS.CC.java.runtimeDirectory=jre/lib/sparc/server
sparc.SunOS.CC.linker.systemLibs=pthread:shared
sparc.SunOS.CC.lib.prefix=lib
+sparc.SunOS.CC.shared.prefix=lib
sparc.SunOS.CC.static.extension=a
sparc.SunOS.CC.shared.extension=so
sparc.SunOS.CC.plugin.extension=so
sparc.SunOS.CC.jni.extension=so
sparc.SunOS.CC.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+sparc.SunOS.cc.static.extension=a
+sparc.SunOS.cc.shared.extension=so
+sparc.SunOS.cc.plugin.extension=so
+sparc.SunOS.cc.jni.extension=so
+
#sparc.SunOS.CC.arch.includes=lib/**/*.a lib/**/*.so
+--
diff --git a/src/site/apt/configuration.apt b/src/site/apt/configuration.apt
index 6b01b91..e0e246a 100644
--- a/src/site/apt/configuration.apt
+++ b/src/site/apt/configuration.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/cpptasks.apt b/src/site/apt/cpptasks.apt
index 55704cb..462daa9 100644
--- a/src/site/apt/cpptasks.apt
+++ b/src/site/apt/cpptasks.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -80,9 +80,9 @@ with some minor extensions:
- [src/net/sf/antcontrib/cpptasks/DependencyInfo.java] cpptasks speedup
+--
- You can find the latest of our mods in our svn repository:
+ You can find the latest of our mods in our git repository:
+--
-svn co svn://svn.freehep.org/svn/misc/trunk/cpptasks
+git clone git://github.com/duns/cpptasks-parallel.git
+--
diff --git a/src/site/apt/faq.apt b/src/site/apt/faq.apt
index ec1796f..86e2560 100644
--- a/src/site/apt/faq.apt
+++ b/src/site/apt/faq.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/intro.apt b/src/site/apt/intro.apt
index 4b641a1..1c62bd9 100644
--- a/src/site/apt/intro.apt
+++ b/src/site/apt/intro.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -170,7 +170,7 @@ os and linker (x86.Windows.msvc for example).
All include files from <<<COMPILER.includePaths>>> are copied to be included
in the noarch nar file.
- << TBD If you set freehep.nar.includefilesonly to true the compilation step will be
+ << TBD If you set maven.nar.includefilesonly to true the compilation step will be
skipped. This flag can be used if you want to distribute a library that only contains pure
abstract classes in include files.>>
@@ -192,7 +192,7 @@ sources, as specified in the patterns in <<<AOL.c.includes>>>,
<<<AOL.nar.src.includes>>> and <<<AOL.fortran.includes>>>, where AOL is a dotted qualifier of the architecture,
os and linker (x86.Windows.msvc for example).
- <<TBD If you set freehep.nar.includefilesonly to true the compile-tests goal will be
+ <<TBD If you set maven.nar.includefilesonly to true the compile-tests goal will be
skipped.>>
@@ -214,7 +214,7 @@ The following jar and nar files are created:
* \<Artifact\>-\<version\>-\<aol\>-\<type\>.nar, a compressed jar file containing machine
specific parts of the distribution, such as the libraries. This file is specific to a particular
- Architecture-OS-Linker (AOL) combination <<TBD and is not generated if freehep.nar.includefilesonly
+ Architecture-OS-Linker (AOL) combination <<TBD and is not generated if maven.nar.includefilesonly
is set>>. Type specifies if this nar is either of type shared, static or jni.
[]
diff --git a/src/site/apt/lifecycle.apt b/src/site/apt/lifecycle.apt
index 3fd11cd..2adff1f 100644
--- a/src/site/apt/lifecycle.apt
+++ b/src/site/apt/lifecycle.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/narDependencies.apt b/src/site/apt/narDependencies.apt
index 526bc7c..e4150b5 100644
--- a/src/site/apt/narDependencies.apt
+++ b/src/site/apt/narDependencies.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/narLibrary.apt b/src/site/apt/narLibrary.apt
index 98d4a11..8f9c6ff 100644
--- a/src/site/apt/narLibrary.apt
+++ b/src/site/apt/narLibrary.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -25,9 +25,8 @@ following to your POM file:
<dependencies>
...
<dependency>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
- <version>2.0-alpha-2-SNAPSHOT</version>
+ <artifactId>maven-nar-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
@@ -41,9 +40,9 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-import org.freehep.maven.nar.Linker;
-import org.freehep.maven.nar.NarManager;
-import org.freehep.maven.nar.NarUtil;
+import org.apache.maven.plugin.nar.Linker;
+import org.apache.maven.plugin.nar.NarManager;
+import org.apache.maven.plugin.nar.NarUtil;
/**
* Description...
diff --git a/src/site/apt/philosophy.apt b/src/site/apt/philosophy.apt
index ce41e2b..a2902bd 100644
--- a/src/site/apt/philosophy.apt
+++ b/src/site/apt/philosophy.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -129,8 +129,7 @@ platform the NAR Plugin is running on. An example is below:
+--
...
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<configuration>
<cpp>
<exceptions>false</exceptions>
@@ -176,8 +175,7 @@ shared library, which depends on a native math library (nmath).
<build>
<plugins>
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<version>nar-version-number</version>
<extensions>true</extensions>
</plugin>
diff --git a/src/site/apt/usage.apt b/src/site/apt/usage.apt
index c64b9f3..d384b1a 100644
--- a/src/site/apt/usage.apt
+++ b/src/site/apt/usage.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -20,8 +20,7 @@ and link native code.
<build>
<plugins>
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<version>nar-version-number</version>
<extensions>true</extensions>
</plugin>
@@ -40,8 +39,7 @@ and link native code.
<build>
<plugins>
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<libraries>
@@ -72,8 +70,7 @@ to disable exceptions and not link with C++.
<build>
<plugins>
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<cpp>
@@ -127,8 +124,7 @@ The example also shows how to configure the
</plugin>
...
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<configuration>
<java>
<include>true</include>
@@ -182,8 +178,7 @@ assemblies would be "pom".
</plugin>
...
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-nar-plugin</artifactId>
+ <artifactId>maven-nar-plugin</artifactId>
<configuration>
<classifiers>
<classifier>x86-Windows-msvc</classifier>
diff --git a/src/site/site.xml b/src/site/site.xml
index c2b6814..bb92917 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,29 +1,38 @@
-<project name="freehep">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project name="maven-nar-plugin">
<bannerLeft>
- <name>FreeHEP NAR Plugin</name>
-<!-- <src>http://maven.apache.org/images/apache-maven-project.png</src> -->
-<!-- FIXME, should this be substituted by some properties -->
+ <name>Maven NAR Plugin</name>
+ <src>http://maven.apache.org/images/apache-maven-project.png</src>
<href>http://java.freehep.org/freehep-nar-plugin</href>
</bannerLeft>
-
- <bannerRight>
- <name>FreeHEP</name>
- <src>http://java.freehep.org/images/sm-freehep.gif</src>
- <href>http://java.freehep.org</href>
- </bannerRight>
-
+
<body>
<links>
<item name="NAR Plugin for Maven1" href="http://java.freehep.org/maven1.x/freehep-nar-plugin"/>
- <item name="FreeHEP 1.x" href="http://java.freehep.org/freehep1.x"/>
- <item name="FreeHEP 2.x" href="http://java.freehep.org/"/>
<item name="Maven 2" href="http://maven.apache.org/maven2/"/>
</links>
<menu name="Overview">
<item name="Introduction" href="intro.html"/>
<item name="Philosophy" href="philosophy.html"/>
- <item name="Presentation (pdf)" href="NARPlugin.pdf"/>
<item name="Presentation (ppt)" href="NARPlugin.ppt"/>
</menu>
@@ -43,8 +52,9 @@
<item name="APIDocs" href="apidocs/index.html"/>
<item name="NAR Library" href="narLibrary.html"/>
<item name="CPPTasks" href="cpptasks.html"/>
- <item name="SVN Browse" href="http://java.freehep.org/svn/repobrowser.svn?path=%2ffreehep%2ftrunk%2fmaven-plugins%2ffreehep-nar-plugin/&amp;revision=HEAD"/>
- <item name="SVN Repository" href="source-repository.html"/>
+ <item name="Git Browse nar-plugin" href="http://github.com/duns/maven-nar-plugin"/>
+ <item name="Git Browse cpptasks" href="http://github.com/duns/cpptasks-parallel"/>
+ <item name="Git Repository" href="source-repository.html"/>
</menu>
<menu name="Examples">
<item name="HelloWorld" href="HelloWorld.html"/>
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-23 02:38:54 +0000