Update the build process

carsomyr · Aug 15, 2010 · da4b7a7 · da4b7a7
1 parent d6d69d3
commit da4b7a7
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 60 deletions.
diff --git a/.classpath b/.classpath
@@ -6,6 +6,6 @@
     <classpathentry kind="src" path="src_test"/>
     <classpathentry kind="src" path="src_extensions"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=build%2Fivy.xml&amp;confs=*"/>
+    <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=shared&amp;ivyXmlPath=build%2Fivy.xml&amp;confs=*"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-    <name>Shared</name>
+    <name>shared</name>
     <comment></comment>
     <projects>
     </projects>
@@ -86,5 +86,6 @@
         <nature>org.eclipse.jdt.core.javanature</nature>
         <nature>org.eclipse.cdt.core.ccnature</nature>
         <nature>org.python.pydev.pythonNature</nature>
+        <nature>org.apache.ivyde.eclipse.ivynature</nature>
     </natures>
 </projectDescription>
diff --git a/.pydevproject b/.pydevproject
@@ -5,6 +5,6 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/Shared</path>
+<path>/shared</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/build.xml b/build.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
-<project basedir="." default="build" name="Shared" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
+<project basedir="." default="build" name="shared" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
     <property environment="env" />
     <property file="src/shared/project.properties" />
 
     <property name="target" value="1.6" />
     <property name="source" value="1.6" />
-    <property name="ivy.install.version" value="2.1.0" />
+    <property name="ivy.install.version" value="2.2.0" />
 
     <!-- Source and class paths. -->
 
-    <path id="Shared.sourcepath">
+    <path id="shared.sourcepath">
         <pathelement location="src" />
         <pathelement location="src_commons" />
         <pathelement location="src_extensions" />
         <pathelement location="src_net" />
         <pathelement location="src_test" />
     </path>
 
-    <path id="Shared.classpath">
+    <path id="shared.classpath">
         <pathelement location="bin" />
         <pathelement location="build/ivy.jar" />
         <pathelement location="build/conf" />
@@ -36,15 +36,15 @@
         <mkdir dir="distrib/sources" />
         <mkdir dir="distrib/resources" />
         <available file=".dependencies" property="build.dependencies" />
-        <available resource="org/apache/ivy/ant/antlib.xml" property="ivy.install" classpathref="Shared.classpath" />
+        <available resource="org/apache/ivy/ant/antlib.xml" property="ivy.install" classpathref="shared.classpath" />
     </target>
 
     <target name="ivy-install" depends="init" unless="ivy.install">
         <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="build/ivy.jar" usetimestamp="true" />
     </target>
 
     <target name="ivy-prepare" depends="ivy-install" unless="ivy.settings.file">
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="Shared.classpath" />
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="shared.classpath" />
         <ivy:configure file="build/ivysettings.xml" />
     </target>
 
@@ -58,14 +58,14 @@
     </target>
 
     <target name="build-prepare" depends="ivy-retrieve">
-        <taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" classpathref="Shared.classpath" />
-        <taskdef name="javah" classname="org.apache.tools.ant.taskdefs.optional.Javah" classpathref="Shared.classpath" />
+        <taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" classpathref="shared.classpath" />
+        <taskdef name="javah" classname="org.apache.tools.ant.taskdefs.optional.Javah" classpathref="shared.classpath" />
     </target>
 
     <target name="build-project" depends="build-prepare">
         <javac debug="true" debuglevel="source,lines,vars" destdir="bin" source="${source}" target="${target}" includeAntRuntime="false">
-            <src refid="Shared.sourcepath" />
-            <classpath refid="Shared.classpath" />
+            <src refid="shared.sourcepath" />
+            <classpath refid="shared.classpath" />
         </javac>
     </target>
 
@@ -86,7 +86,7 @@
 
     <!-- Jar targets. -->
 
-    <fileset id="Shared.metainf" dir=".">
+    <fileset id="shared.metainf" dir=".">
         <include name="license.txt" />
         <include name="license/license_*.txt" />
     </fileset>
@@ -96,85 +96,85 @@
             <manifest>
                 <attribute name="Main-Class" value="shared.test.All" />
             </manifest>
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-base" depends="build-project, build-resource">
         <jar destfile="distrib/jars/sst-base-${build.version}.jar" basedir="bin" includes="shared/**, font/**" excludes="shared/test/**, shared/cli/**, shared/codec/**, shared/log/**, shared/net/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-base-src" depends="build-project, build-resource">
         <jar destfile="distrib/sources/sst-base-src-${build.version}.jar" basedir="src" includes="shared/**, font/**" excludes="shared/test/**, shared/cli/**, shared/codec/**, shared/log/**, shared/net/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-build-conf" depends="build-project, build-resource">
         <jar destfile="distrib/resources/sst-build-conf-${build.version}.jar" basedir="build" includes="conf/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-commons" depends="build-project, build-resource">
         <jar destfile="distrib/jars/sst-commons-${build.version}.jar" basedir="bin" includes="shared/cli/**, shared/codec/**, shared/log/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-commons-src" depends="build-project, build-resource">
         <jar destfile="distrib/sources/sst-commons-src-${build.version}.jar" basedir="src_commons" includes="shared/cli/**, shared/codec/**, shared/log/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-extensions" depends="build-project, build-resource">
         <jar destfile="distrib/jars/sst-extensions-${build.version}.jar" basedir="bin" includes="sharedx/**" excludes="sharedx/test/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-extensions-src" depends="build-project, build-resource">
         <jar destfile="distrib/sources/sst-extensions-src-${build.version}.jar" basedir="src_extensions" includes="sharedx/**" excludes="sharedx/test/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-native" depends="build-project, build-resource">
         <jar destfile="distrib/resources/sst-native-${build.version}.jar" basedir="build" includes="lib/**" excludes="lib/*.jar">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-nativex" depends="build-project, build-resource">
         <jar destfile="distrib/resources/sst-nativex-${build.version}.jar" basedir="build" includes="libx/**" excludes="libx/*.jar">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-net" depends="build-project, build-resource">
         <jar destfile="distrib/jars/sst-net-${build.version}.jar" basedir="bin" includes="shared/net/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-net-src" depends="build-project, build-resource">
         <jar destfile="distrib/sources/sst-net-src-${build.version}.jar" basedir="src_net" includes="shared/net/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-test" depends="build-project, build-resource">
         <jar destfile="distrib/jars/sst-test-${build.version}.jar" basedir="bin" includes="shared/test/**, sharedx/test/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
     <target name="jar-test-src" depends="build-project, build-resource">
         <jar destfile="distrib/sources/sst-test-src-${build.version}.jar" basedir="src_test" includes="shared/test/**, sharedx/test/**">
-            <metainf refid="Shared.metainf" />
+            <metainf refid="shared.metainf" />
         </jar>
     </target>
 
@@ -202,7 +202,7 @@
             <class name="shared.image.jni.NativeImageKernel" />
             <class name="shared.array.kernel.ArrayKernel" />
             <class name="shared.array.jni.NativeArrayKernel" />
-            <classpath refid="Shared.classpath" />
+            <classpath refid="shared.classpath" />
         </javah>
     </target>
 
@@ -211,18 +211,18 @@
             <class name="sharedx.fftw.Plan" />
             <class name="sharedx.test.BenchmarkNative" />
             <class name="sharedx.test.BenchmarkSpecification" />
-            <classpath refid="Shared.classpath" />
+            <classpath refid="shared.classpath" />
         </javah>
     </target>
 
     <!-- Javadoc target. -->
 
     <target name="javadoc" depends="build-project">
         <javadoc access="protected" destdir="javadoc" packagenames="*" source="${source}" splitindex="true" failonerror="true" author="true" use="true" version="true">
-            <sourcepath refid="Shared.sourcepath" />
-            <classpath refid="Shared.classpath" />
+            <sourcepath refid="shared.sourcepath" />
+            <classpath refid="shared.classpath" />
             <link href="http://java.sun.com/javase/6/docs/api/" />
-            <doclet name="org.jboss.apiviz.APIviz" pathref="Shared.classpath" />
+            <doclet name="org.jboss.apiviz.APIviz" pathref="shared.classpath" />
         </javadoc>
         <touch file=".javadoc" />
     </target>
@@ -257,8 +257,8 @@
         <delete file="native/include/jni/jni_headersx.h" />
         <delete>
             <fileset dir="." includes="*.jar" />
-            <fileset dir="build" includes="lib/*.dll, lib/*.jnilib, lib/*.so" />
-            <fileset dir="build" includes="libx/*.dll, libx/*.jnilib, libx/*.so" />
+            <fileset dir="build" includes="lib/*.dll, lib/*.dylib, lib/*.so" />
+            <fileset dir="build" includes="libx/*.dll, libx/*.dylib, libx/*.so" />
         </delete>
     </target>
 

diff --git a/build/Doxyfile b/build/Doxyfile
@@ -2,7 +2,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = Shared
+PROJECT_NAME           = shared
 PROJECT_NUMBER         =
 OUTPUT_DIRECTORY       = ..
 CREATE_SUBDIRS         = NO

diff --git a/build/ant-launcher.jar b/build/ant-launcher.jar
diff --git a/build/ant.jar b/build/ant.jar
diff --git a/build/environment.mk b/build/environment.mk
@@ -3,7 +3,7 @@ OS			:= $(shell uname)
 ifeq ($(OS), Darwin)
 
 LIB_PREFIX	= lib
-LIB_SUFFIX	= jnilib
+LIB_SUFFIX	= dylib
 
 else
 

diff --git a/build/ivy.xml b/build/ivy.xml
@@ -35,28 +35,20 @@
     </publications>
 
     <dependencies>
-        <dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.0" conf="ant->default">
+        <dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.1" conf="ant->default">
             <exclude module="ant" />
         </dependency>
-        <dependency org="org.jboss.apiviz" name="apiviz" rev="1.3.1.GA" conf="ant->default" />
+        <dependency org="org.jboss.apiviz" name="apiviz" rev="1.3.2.GA" conf="ant->default" />
         <dependency org="checkstyle" name="checkstyle" rev="5.0" conf="checkstyle->default">
             <exclude module="commons-cli" />
             <exclude module="commons-collections" />
         </dependency>
         <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="commons->default" />
         <dependency org="commons-codec" name="commons-codec" rev="1.4" conf="commons->default" />
         <dependency org="junit" name="junit" rev="4.8.1" conf="lib->default" />
-        <dependency org="log4j" name="log4j" rev="1.2.15" conf="commons->default">
-            <exclude module="activation" />
-            <exclude module="jms" />
-            <exclude module="jmxri" />
-            <exclude module="jmxtools" />
-            <exclude module="mail" />
-        </dependency>
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.5.11" conf="commons->default" />
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.11" conf="commons->default">
-            <exclude module="log4j" />
-        </dependency>
+        <dependency org="log4j" name="log4j" rev="1.2.16" conf="commons->default" />
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="commons->default" />
+        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="commons->default" />
     </dependencies>
 
 </ivy-module>
diff --git a/build/ivysettings.xml b/build/ivysettings.xml
@@ -6,7 +6,8 @@
     <resolvers>
         <chain name="public" returnFirst="true">
             <ibiblio name="first" m2compatible="true" />
-            <ibiblio name="second" root="http://repository.jboss.com/maven2/" m2compatible="true" />
+            <ibiblio name="second" root="http://repository.jboss.org/nexus/content/groups/public-jboss/"
+                m2compatible="true" />
         </chain>
     </resolvers>
 

diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION "2.8")
 
-project("Shared")
+project("shared")
 
 include("../build/conf/common.cmake")
 include("FindJNI")
@@ -120,14 +120,6 @@ endif(CL_LIBRARY_FILENAME)
 
 # Special suffix handling for Mac OS.
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-
-    foreach(BUILD_TARGET ${BUILD_TARGETS})
-        set_target_properties(${BUILD_TARGET} PROPERTIES SUFFIX ".jnilib")
-    endforeach(BUILD_TARGET ${BUILD_TARGETS})
-
-endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-
 if(MINGW)
 
     foreach(BUILD_TARGET ${BUILD_TARGETS})