You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2010/09/23 09:18:44 UTC
svn commit: r1000340 - in /incubator/etch/trunk: binding-c/
binding-c/runtime/ binding-csharp/runtime/ binding-java/runtime/
build-support/ examples/chat/ examples/distmap/ examples/example/
examples/helloworld/ examples/perf/ installers/ util/
Author: fitzner
Date: Thu Sep 23 07:18:43 2010
New Revision: 1000340
URL: http://svn.apache.org/viewvc?rev=1000340&view=rev
Log:
[ETCH-92] Integrate C binding to NSIS installer and packaging, changed installer binding-xx installer layout, add os and platform labels
Modified:
incubator/etch/trunk/binding-c/build.xml
incubator/etch/trunk/binding-c/runtime/build.xml
incubator/etch/trunk/binding-csharp/runtime/build.xml
incubator/etch/trunk/binding-java/runtime/build.xml
incubator/etch/trunk/build-support/etch.common.xml
incubator/etch/trunk/examples/chat/build.xml
incubator/etch/trunk/examples/chat/dist-build.xml
incubator/etch/trunk/examples/distmap/build.xml
incubator/etch/trunk/examples/distmap/dist-build.xml
incubator/etch/trunk/examples/example/build.xml
incubator/etch/trunk/examples/example/dist-build.xml
incubator/etch/trunk/examples/helloworld/build.xml
incubator/etch/trunk/examples/helloworld/dist-build.xml
incubator/etch/trunk/examples/perf/build.xml
incubator/etch/trunk/examples/perf/dist-build.xml
incubator/etch/trunk/installers/build.xml
incubator/etch/trunk/installers/etch-maven-install.bat
incubator/etch/trunk/util/build.xml
Modified: incubator/etch/trunk/binding-c/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/build.xml (original)
+++ incubator/etch/trunk/binding-c/build.xml Thu Sep 23 07:18:43 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations *
* under the License. *
-->
-<project name="etch-c-binding" basedir="." default="help">
+<project name="etch-c-binding" basedir="." default="">
<description>Etch-to-C Binding</description>
<property name="Etch.basedir" location="${basedir}/.." />
<import file="${Etch.basedir}/build-support/etch.common.xml" />
Modified: incubator/etch/trunk/binding-c/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/runtime/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-c/runtime/build.xml Thu Sep 23 07:18:43 2010
@@ -25,7 +25,7 @@
<!-- Static properties of the sub-project -->
<property name="proj" location="${Etch.basedir}/binding-c/runtime/c" />
<property name="target" location="${proj}/target" />
- <property name="testResultsDirectory" location="${target}/test-results" />
+ <property name="testResultsDirectory" location="${target}/test-results" />
<!-- INIT TARGET -->
<!-- Modify this target to define project specific properties that can only be set at runtime -->
@@ -47,8 +47,9 @@
</target>
<target name="do-build-generate-sources" if="USE.cmake">
+ <mkdir dir="${Etch.dist}/binding-c" />
<!-- package up etch-java-runtime src -->
- <zip destfile="${Etch.dist}/lib/${etch-c-runtime-src.zip}">
+ <zip destfile="${Etch.dist}/binding-c/${etch-c-runtime-src.zip}">
<fileset dir="${proj}">
<exclude name="target/" />
<exclude name="doc/" />
@@ -69,19 +70,26 @@
<mkdir dir="${Etch.dist}/binding-c/include" />
<mkdir dir="${Etch.dist}/binding-c/lib" />
+ <!-- copy etch library to dist folder -->
<copy todir="${Etch.dist}/binding-c/include">
<fileset dir="${proj}/include">
<exclude name="**/.svn" />
</fileset>
</copy>
- <copy todir="${Etch.dist}/binding-c/lib">
+ <copy todir="${Etch.dist}/binding-c/lib" flatten="true">
<fileset dir="${target}/src/main">
<include name="debug/etch.lib" />
<include name="debug/etch.pdb" />
<include name="libetch.a" />
</fileset>
</copy>
+
+ <!-- copy apr library to dist folder -->
+ <copy todir="${Etch.dist}/binding-c/extern/apr">
+ <fileset dir="${env.ETCH_EXTERNAL_DEPENDS}/apr/1.3.12">
+ </fileset>
+ </copy>
</target>
<!-- TEST TARGET -->
Modified: incubator/etch/trunk/binding-csharp/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/runtime/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-csharp/runtime/build.xml Thu Sep 23 07:18:43 2010
@@ -53,9 +53,12 @@
<target name="generate-sources" >
<!-- Generate version info -->
<update-tokens filename="${src}/main/csharp/Properties/AssemblyInfo.cs" />
-
- <!-- package up etch-java-runtime src -->
- <zip destfile="${Etch.dist}/lib/${etch-csharp-runtime-src.zip}" >
+
+ <!-- create dist folder -->
+ <mkdir dir="${Etch.dist}/binding-csharp/lib" />
+
+ <!-- package up etch-java-runtime src -->
+ <zip destfile="${Etch.dist}/binding-csharp/${etch-csharp-runtime-src.zip}" >
<fileset dir="${src}/main/csharp" >
<include name="Org.Apache.Etch.Bindings.Csharp/**/*.cs" />
</fileset>
@@ -81,14 +84,14 @@
<mkdir dir="${Etch.dist}/lib" />
<mkdir dir="${Etch.clover-dist}/lib" />
- <copy todir="${Etch.clover-dist}/lib" >
+ <copy todir="${Etch.clover-dist}/binding-csharp/lib" >
<fileset dir="${src}/main/csharp/bin/${Etch.build.target}">
<include name="${etch-csharp-runtime.pdb}" />
<include name="${etch-csharp-runtime.dll}" />
</fileset>
</copy>
- <copy todir="${Etch.dist}/lib" >
+ <copy todir="${Etch.dist}/binding-csharp/lib" >
<fileset dir="${src}/main/csharp/bin/${Etch.build.target}">
<include name="${etch-csharp-runtime.pdb}" />
<include name="${etch-csharp-runtime.dll}" />
Modified: incubator/etch/trunk/binding-java/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-java/runtime/build.xml Thu Sep 23 07:18:43 2010
@@ -80,12 +80,12 @@
<macrodef name="bundle-jars" >
<attribute name="dist" default="${Etch.dist}" />
<sequential>
- <mkdir dir="@{dist}/lib" />
+ <mkdir dir="@{dist}/binding-java/lib" />
<!-- CREATE jars -->
<!-- Package up etch-java-runtime jar -->
- <jar jarfile="@{dist}/lib/${etch-java-runtime.jar}" >
+ <jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" >
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
@@ -113,7 +113,7 @@
<!-- CREATE source archives -->
<!-- package up etch-java-runtime src -->
- <zip destfile="@{dist}/lib/${etch-java-runtime-src.zip}" >
+ <zip destfile="@{dist}/binding-java/${etch-java-runtime-src.zip}" >
<fileset dir="${src}/main/java" >
<include name="org/apache/etch/bindings/**/*.java" />
</fileset>
@@ -131,26 +131,26 @@
<attribute name="support" default="${Etch.support}" />
<sequential>
<!-- repackage .jar -->
- <mkdir dir="@{dist}/lib" />
+ <mkdir dir="@{dist}/binding-java/lib" />
<delete dir="${target}/tmp-runtime" quiet="true" />
<mkdir dir="${target}/tmp-runtime" />
<unjar src="@{support}/lib/${etch-util.jar}" dest="${target}/tmp-runtime" />
- <unjar src="@{support}/lib/${etch-java-runtime.jar}" dest="${target}/tmp-runtime" />
+ <unjar src="@{support}/binding-java/lib/${etch-java-runtime.jar}" dest="${target}/tmp-runtime" />
- <jar jarfile="@{dist}/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge" >
- <fileset dir="${target}/tmp-runtime" />
+ <jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge" >
+ <fileset dir="${target}/tmp-runtime" />
</jar>
<!-- repackage .zip src -->
- <mkdir dir="@{dist}/lib" />
+ <mkdir dir="@{dist}/binding-java" />
<delete dir="${target}/tmp-runtime-src" quiet="true" />
<mkdir dir="${target}/tmp-runtime-src" />
<unzip src="@{support}/lib/${etch-util-src.zip}" dest="${target}/tmp-runtime-src" />
- <unzip src="@{support}/lib/${etch-java-runtime-src.zip}" dest="${target}/tmp-runtime-src" />
+ <unzip src="@{support}/binding-java/${etch-java-runtime-src.zip}" dest="${target}/tmp-runtime-src" />
- <zip destfile="@{dist}/lib/${etch-java-runtime-src.zip}" >
+ <zip destfile="@{dist}/binding-java/${etch-java-runtime-src.zip}" >
<fileset dir="${target}/tmp-runtime-src" />
</zip>
@@ -200,11 +200,11 @@
<!-- initialize-clover -->
<initialize-clover suffix="etchjavabinding" >
<fileset dir="${src}/main/java">
- <exclude name="**/.svn/**" />
+ <exclude name="**/.svn/**" />
<include name="**/*.java" />
</fileset>
<testsources dir="${src}/test/java">
- <exclude name="**/.svn/**" />
+ <exclude name="**/.svn/**" />
<include name="**/*.java" />
</testsources>
</initialize-clover>
@@ -241,7 +241,7 @@
<formatter type="xml"/>
<batchtest fork="true" todir="${testResultsDirectory}">
<fileset dir="${src}/test/java">
- <exclude name="**/.svn/**" />
+ <exclude name="**/.svn/**" />
<include name="**/*.java" />
</fileset>
</batchtest>
Modified: incubator/etch/trunk/build-support/etch.common.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.common.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.common.xml (original)
+++ incubator/etch/trunk/build-support/etch.common.xml Thu Sep 23 07:18:43 2010
@@ -34,7 +34,7 @@
<!-- Pull properties from commandline -->
<condition property="build.skip.tests" value="${skip.tests}">
- <isset property="skip.tests" />
+ <isset property="skip.tests" />
</condition>
<condition property="build.javacc.home" value="${javacc.home}" >
@@ -76,6 +76,12 @@
<condition property="Etch.property.patchVersion" value="0" >
<not><isset property="Etch.property.patchVersion" /></not>
</condition>
+ <condition property="Etch.property.osVersion" value="unknown" >
+ <not><isset property="Etch.property.osVersion" /></not>
+ </condition>
+ <condition property="Etch.property.platformVersion" value="unknown" >
+ <not><isset property="Etch.property.platformVersion" /></not>
+ </condition>
<condition property="Etch.runtime.buildKey" value="LOCAL" >
<not><isset property="Etch.runtime.buildKey" /></not>
</condition>
@@ -124,11 +130,18 @@
<property name="etch-ant-task.jar" value="apache-etch-ant-plugin-${Etch.longversion}.jar" />
<property name="etch-ant-task-src.zip" value="apache-etch-ant-plugin-${Etch.longversion}-src.zip" />
+ <!-- java-runtime -->
<property name="etch-java-runtime.jar" value="apache-etch-java-runtime-${Etch.longversion}.jar" />
+ <property name="etch-java-runtime.zip" value="apache-etch-java-runtime-${Etch.longversion}.zip" />
<property name="etch-java-runtime-src.zip" value="apache-etch-java-runtime-${Etch.longversion}-src.zip" />
+ <!-- csharp-runtime -->
<property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll" />
<property name="etch-csharp-runtime.pdb" value="ApacheEtchCsharpIncubating.pdb" />
- <property name="etch-csharp-runtime-src.zip" value="ApacheEtchCsharpIncubatingSrc.zip" />
+ <property name="etch-csharp-runtime.zip" value="apache-etch-csharp-runtime-${Etch.longversion}.zip" />
+ <property name="etch-csharp-runtime-src.zip" value="apache-etch-csharp-runtime-${Etch.longversion}-src.zip" />
+ <!-- c-runtime -->
+ <property name="etch-c-runtime.dll" value="etch.dll" />
+ <property name="etch-c-runtime.pdb" value="etch.pdb" />
<property name="etch-c-runtime.zip" value="apache-etch-c-runtime-${Etch.longversion}.zip" />
<property name="etch-c-runtime-src.zip" value="apache-etch-c-runtime-${Etch.longversion}-src.zip" />
Modified: incubator/etch/trunk/examples/chat/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/build.xml (original)
+++ incubator/etch/trunk/examples/chat/build.xml Thu Sep 23 07:18:43 2010
@@ -43,7 +43,7 @@
<condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
-
+
<condition property="etch.longversion" value="${Etch.longversion}" >
<not><isset property="etch.longversion" /></not>
</condition>
@@ -150,7 +150,7 @@
value="apache-etch-java-runtime-${etch.longversion}.jar" />
<property name="Etch.dependency.java.runtime"
- location="${etch.home}/lib/${etch-java-runtime-name}" />
+ location="${etch.home}/binding-java/lib/${etch-java-runtime-name}" />
<target name="build-java" depends="generate-sources" >
<!-- compile sources -->
Modified: incubator/etch/trunk/examples/chat/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/dist-build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/dist-build.xml (original)
+++ incubator/etch/trunk/examples/chat/dist-build.xml Thu Sep 23 07:18:43 2010
@@ -24,11 +24,11 @@
<property name="etch.version" value="@EtchVersion@"/>
<property name="etch.longversion" value="@EtchLongVersion@"/>
<property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar"/>
- <property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll"/>
-
- <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
- <property name="etch-java-runtime.jar" location="${etch.home}/lib/${etch-java-runtime-name}"/>
- <property name="etch.dll" location="${etch.home}/lib/${etch-csharp-runtime.dll}"/>
+ <property name="etch-csharp-runtime-name" value="ApacheEtchCsharpIncubating.dll"/>
+
+ <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
+ <property name="etch-java-runtime.jar" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}"/>
+ <property name="etch-csharp-runtime.dll" location="${etch.home}/binding-csharp/lib/${etch-csharp-runtime-name}"/>
<property name="src" location="${basedir}/src"/>
<property name="src-main-etch" location="${src}/main/etch"/>
@@ -108,7 +108,7 @@ You can mix and match the various client
<src dir="${src-main-csharp}/ChatClientProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.chat" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
<csc
@@ -122,10 +122,10 @@ You can mix and match the various client
<src dir="${src-main-csharp}/ChatListenerProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.chat" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
- <copy todir="${bin}" file="${etch.dll}"/>
+ <copy todir="${bin}" file="${etch-csharp-runtime.dll}"/>
</target>
<target name="gensrc" depends="gensrc-java, gensrc-csharp"/>
Modified: incubator/etch/trunk/examples/distmap/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/build.xml (original)
+++ incubator/etch/trunk/examples/distmap/build.xml Thu Sep 23 07:18:43 2010
@@ -43,7 +43,7 @@
<condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
-
+
<condition property="etch.longversion" value="${Etch.longversion}" >
<not><isset property="etch.longversion" /></not>
</condition>
@@ -150,7 +150,7 @@
value="apache-etch-java-runtime-${etch.longversion}.jar" />
<property name="Etch.dependency.java.runtime"
- location="${etch.home}/lib/${etch-java-runtime-name}" />
+ location="${etch.home}/binding-java/lib/${etch-java-runtime-name}" />
<target name="build-java" depends="generate-sources" >
<!-- compile sources -->
Modified: incubator/etch/trunk/examples/distmap/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/dist-build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/dist-build.xml (original)
+++ incubator/etch/trunk/examples/distmap/dist-build.xml Thu Sep 23 07:18:43 2010
@@ -24,11 +24,11 @@
<property name="etch.version" value="@EtchVersion@"/>
<property name="etch.longversion" value="@EtchLongVersion@"/>
<property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar"/>
- <property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll"/>
-
- <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
- <property name="etch-java-runtime.jar" location="${etch.home}/lib/${etch-java-runtime-name}"/>
- <property name="etch.dll" location="${etch.home}/lib/${etch-csharp-runtime.dll}"/>
+ <property name="etch-csharp-runtime-name" value="ApacheEtchCsharpIncubating.dll"/>
+
+ <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
+ <property name="etch-java-runtime.jar" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}"/>
+ <property name="etch-csharp-runtime.dll" location="${etch.home}/binding-csharp/lib/${etch-csharp-runtime-name}"/>
<property name="src" location="${basedir}/src"/>
<property name="src-main-etch" location="${src}/main/etch"/>
@@ -102,7 +102,7 @@ You can mix and match the various client
<src dir="${src-main-csharp}/DistMapClientProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.distmap" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
<csc
@@ -116,10 +116,10 @@ You can mix and match the various client
<src dir="${src-main-csharp}/DistMapListenerProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.distmap" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
- <copy todir="${bin}" file="${etch.dll}"/>
+ <copy todir="${bin}" file="${etch-csharp-runtime.dll}"/>
</target>
<target name="gensrc" depends="gensrc-java, gensrc-csharp"/>
Modified: incubator/etch/trunk/examples/example/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/build.xml (original)
+++ incubator/etch/trunk/examples/example/build.xml Thu Sep 23 07:18:43 2010
@@ -150,7 +150,7 @@
value="apache-etch-java-runtime-${etch.longversion}.jar" />
<property name="Etch.dependency.java.runtime"
- location="${etch.home}/lib/${etch-java-runtime-name}" />
+ location="${etch.home}/binding-java/lib/${etch-java-runtime-name}" />
<target name="build-java" depends="generate-sources" >
<!-- compile sources -->
Modified: incubator/etch/trunk/examples/example/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/dist-build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/dist-build.xml (original)
+++ incubator/etch/trunk/examples/example/dist-build.xml Thu Sep 23 07:18:43 2010
@@ -24,11 +24,11 @@
<property name="etch.version" value="@EtchVersion@"/>
<property name="etch.longversion" value="@EtchLongVersion@"/>
<property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar"/>
- <property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll"/>
-
- <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
- <property name="etch-java-runtime.jar" location="${etch.home}/lib/${etch-java-runtime-name}"/>
- <property name="etch.dll" location="${etch.home}/lib/${etch-csharp-runtime.dll}"/>
+ <property name="etch-csharp-runtime-name" value="ApacheEtchCsharpIncubating.dll"/>
+
+ <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
+ <property name="etch-java-runtime.jar" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}"/>
+ <property name="etch-csharp-runtime.dll" location="${etch.home}/binding-csharp/lib/${etch-csharp-runtime-name}"/>
<property name="src" location="${basedir}/src"/>
<property name="src-main-etch" location="${src}/main/etch"/>
@@ -104,7 +104,7 @@ You can mix and match the various client
<src dir="${src-main-csharp}/ExampleClientProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.example" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
<csc
@@ -118,10 +118,10 @@ You can mix and match the various client
<src dir="${src-main-csharp}/ExampleListenerProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.example" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
- <copy todir="${bin}" file="${etch.dll}"/>
+ <copy todir="${bin}" file="${etch-csharp-runtime.dll}"/>
</target>
<target name="gensrc" depends="gensrc-java, gensrc-csharp"/>
Modified: incubator/etch/trunk/examples/helloworld/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/build.xml (original)
+++ incubator/etch/trunk/examples/helloworld/build.xml Thu Sep 23 07:18:43 2010
@@ -43,7 +43,7 @@
<condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
-
+
<condition property="etch.longversion" value="${Etch.longversion}" >
<not><isset property="etch.longversion" /></not>
</condition>
@@ -73,10 +73,7 @@
</condition>
<!-- import etch task -->
- <taskdef
- onerror="report"
- resource="org/apache/etch/tools/ant/etch.xml"
- classpath="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar" />
+ <taskdef onerror="report" resource="org/apache/etch/tools/ant/etch.xml" classpath="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar" />
<!-- import dotnet task -->
<condition property="ant.dotnet.jar" value="ant-dotnet-1.0.jar" >
@@ -152,11 +149,8 @@
outputDir="${gen-src-c}" />
</target>
- <property name="etch-java-runtime-name"
- value="apache-etch-java-runtime-${etch.longversion}.jar" />
-
- <property name="Etch.dependency.java.runtime"
- location="${etch.home}/lib/${etch-java-runtime-name}" />
+ <property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar" />
+ <property name="Etch.dependency.java.runtime" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}" />
<target name="build-java" depends="generate-sources" >
<!-- compile sources -->
Modified: incubator/etch/trunk/examples/helloworld/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/dist-build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/dist-build.xml (original)
+++ incubator/etch/trunk/examples/helloworld/dist-build.xml Thu Sep 23 07:18:43 2010
@@ -23,12 +23,13 @@
<property name="etch.home" location="${basedir}/../.."/>
<property name="etch.version" value="@EtchVersion@"/>
<property name="etch.longversion" value="@EtchLongVersion@"/>
+ <!-- todo clean up variables etch-java-runtime.jar, etch-csharp-runtime.dll -->
<property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar"/>
- <property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll"/>
-
- <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
- <property name="etch-java-runtime.jar" location="${etch.home}/lib/${etch-java-runtime-name}"/>
- <property name="etch.dll" location="${etch.home}/lib/${etch-csharp-runtime.dll}"/>
+ <property name="etch-csharp-runtime-name" value="ApacheEtchCsharpIncubating.dll"/>
+
+ <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
+ <property name="etch-java-runtime.jar" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}"/>
+ <property name="etch-csharp-runtime.dll" location="${etch.home}/binding-csharp/lib/${etch-csharp-runtime-name}"/>
<property name="src" location="${basedir}/src"/>
<property name="src-main-etch" location="${src}/main/etch"/>
@@ -45,9 +46,7 @@
<os family="windows" />
</condition>
- <taskdef
- resource="org/apache/etch/tools/ant/etch.xml"
- classpath="${etch-ant-plugin.jar}"/>
+ <taskdef resource="org/apache/etch/tools/ant/etch.xml" classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
@@ -101,9 +100,9 @@ You can mix and match the various client
mainClass = "org.apache.etch.examples.helloworld.MainHelloWorldClient"
destFile="${bin}/HelloWorldClient.exe">
<src dir="${src-main-csharp}/HelloWorldClientProj" includes="**/*.cs"/>
- <src dir="${src-main-csharp}/etch.examples.helloworld" includes="**/*.cs"/>
+ <src dir="${src-main-csharp}/org.apache.etch.examples.helloworld" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
<csc
@@ -115,12 +114,12 @@ You can mix and match the various client
mainClass = "org.apache.etch.examples.helloworld.MainHelloWorldListener"
destFile="${bin}/HelloWorldListener.exe">
<src dir="${src-main-csharp}/HelloWorldListenerProj" includes="**/*.cs"/>
- <src dir="${src-main-csharp}/etch.examples.helloworld" includes="**/*.cs"/>
+ <src dir="${src-main-csharp}/org.apache.etch.examples.helloworld" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
- <copy todir="${bin}" file="${etch.dll}"/>
+ <copy todir="${bin}" file="${etch-csharp-runtime.dll}"/>
</target>
<target name="gensrc" depends="gensrc-java, gensrc-csharp"/>
Modified: incubator/etch/trunk/examples/perf/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/build.xml (original)
+++ incubator/etch/trunk/examples/perf/build.xml Thu Sep 23 07:18:43 2010
@@ -150,7 +150,7 @@
value="apache-etch-java-runtime-${etch.longversion}.jar" />
<property name="Etch.dependency.java.runtime"
- location="${etch.home}/lib/${etch-java-runtime-name}" />
+ location="${etch.home}/binding-java/lib/${etch-java-runtime-name}" />
<target name="build-java" depends="generate-sources" >
<!-- compile sources -->
Modified: incubator/etch/trunk/examples/perf/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/dist-build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/dist-build.xml (original)
+++ incubator/etch/trunk/examples/perf/dist-build.xml Thu Sep 23 07:18:43 2010
@@ -24,11 +24,11 @@
<property name="etch.version" value="@EtchVersion@"/>
<property name="etch.longversion" value="@EtchLongVersion@"/>
<property name="etch-java-runtime-name" value="apache-etch-java-runtime-${etch.longversion}.jar"/>
- <property name="etch-csharp-runtime.dll" value="ApacheEtchCsharpIncubating.dll"/>
-
- <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
- <property name="etch-java-runtime.jar" location="${etch.home}/lib/${etch-java-runtime-name}"/>
- <property name="etch.dll" location="${etch.home}/lib/${etch-csharp-runtime.dll}"/>
+ <property name="etch-csharp-runtime-name" value="ApacheEtchCsharpIncubating.dll"/>
+
+ <property name="etch-ant-plugin.jar" location="${etch.home}/lib/apache-etch-ant-plugin-${etch.longversion}.jar"/>
+ <property name="etch-java-runtime.jar" location="${etch.home}/binding-java/lib/${etch-java-runtime-name}"/>
+ <property name="etch-csharp-runtime.dll" location="${etch.home}/binding-csharp/lib/${etch-csharp-runtime-name}"/>
<property name="src" location="${basedir}/src"/>
<property name="src-main-etch" location="${src}/main/etch"/>
@@ -102,7 +102,7 @@ You can mix and match the various client
<src dir="${src-main-csharp}/PerfClientProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.perf" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
<csc
@@ -116,10 +116,10 @@ You can mix and match the various client
<src dir="${src-main-csharp}/PerfListenerProj" includes="**/*.cs"/>
<src dir="${src-main-csharp}/etch.examples.perf" includes="**/*.cs"/>
<src dir="${gensrc-main-etch-csharp}" includes="**/*.cs"/>
- <reference file="${etch.dll}"/>
+ <reference file="${etch-csharp-runtime.dll}"/>
</csc>
- <copy todir="${bin}" file="${etch.dll}"/>
+ <copy todir="${bin}" file="${etch-csharp-runtime.dll}"/>
</target>
<target name="gensrc" depends="gensrc-java, gensrc-csharp"/>
Modified: incubator/etch/trunk/installers/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/installers/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/installers/build.xml (original)
+++ incubator/etch/trunk/installers/build.xml Thu Sep 23 07:18:43 2010
@@ -52,14 +52,14 @@
<copy file="${Etch.basedir}/DISCLAIMER.txt" tofile="${Etch.dist}/DISCLAIMER.txt" />
<copy file="${Etch.basedir}/RELEASE_NOTES.txt" tofile="${Etch.dist}/RELEASE_NOTES.txt" />
<copy file="${Etch.basedir}/NOTICE.txt" tofile="${Etch.dist}/NOTICE.txt" />
- <copy file="${proj}/etch-maven-install.bat" todir="${Etch.dist}/maven" >
+ <copy file="${proj}/etch-maven-install.bat" todir="${Etch.dist}/bin" >
<filterset refid="Etch.buildTokens" />
</copy>
</target>
<target name="do-zips" >
<!-- create zipped binary distribution -->
- <zip destfile="${target}/${packageName}.zip" >
+ <zip destfile="${target}/${packageName}-${Etch.property.osVersion}-${Etch.property.platformVersion}-bin.zip" >
<zipfileset dir="${Etch.dist}" prefix="${packageName}/" >
<exclude name="bin/etch" />
</zipfileset>
@@ -69,7 +69,7 @@
</zip>
<!-- create tar-gzip binary distribution -->
- <tar destfile="${target}/${packageName}.tar.gz" compression="gzip" >
+ <tar destfile="${target}/${packageName}-${Etch.property.osVersion}-${Etch.property.platformVersion}-bin.tar.gz" compression="gzip" >
<tarfileset dir="${Etch.dist}" prefix="${packageName}/">
<exclude name="bin/etch" />
</tarfileset>
@@ -80,7 +80,7 @@
</target>
<target name="do-nsis" if="NSIS.enabled" >
- <makensis destfile="${target}/${packageName}-setup.exe" root="${Etch.basedir}" dir="installers" script="etch-full-installer" />
+ <makensis destfile="${target}/${packageName}-${Etch.property.osVersion}-${Etch.property.platformVersion}-setup.exe" root="${Etch.basedir}" dir="installers" script="etch-full-installer" />
</target>
<target name="do-build" depends="do-txts,do-nsis,do-zips" />
Modified: incubator/etch/trunk/installers/etch-maven-install.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/installers/etch-maven-install.bat?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/installers/etch-maven-install.bat (original)
+++ incubator/etch/trunk/installers/etch-maven-install.bat Thu Sep 23 07:18:43 2010
@@ -27,7 +27,10 @@ rem Define the etch home directory and a
set ETCH_HOME=%~dp0..
set GROUP=org.apache.etch
-set ARTIFACTS=apache-etch-ant-plugin, apache-etch-compiler, apache-etch-csharp-compiler, apache-etch-java-compiler, apache-etch-java-runtime, apache-etch-xml-compiler
+set ARTIFACTS_COMPILER=apache-etch-ant-plugin, apache-etch-compiler, apache-etch-csharp-compiler, apache-etch-java-compiler, apache-etch-c-compiler, apache-etch-xml-compiler
+set ARTIFACTS_RUNTIME_BINDING-JAVA=apache-etch-java-runtime
+set ARTIFACTS_RUNTIME_BINDING-CSHARP=apache-etch-csharp-runtime
+set ARTIFACTS_RUNTIME_BINDING-C=apache-etch-c-runtime
set VERSION=@EtchVersion@-incubating
if "%M2_HOME%" == "" goto try_maven_home
@@ -45,5 +48,9 @@ goto run_mvn
set MVN=mvn.bat
:run_mvn
-FOR %%A IN (%ARTIFACTS%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\lib\%%A-%VERSION%.jar" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=jar
-FOR %%A IN (%ARTIFACTS%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\lib\%%A-%VERSION%-src.zip" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=zip -Dclassifier=src
+rem compiler bin and source
+FOR %%A IN (%ARTIFACTS_COMPILER%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\lib\%%A-%VERSION%.jar" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=jar
+FOR %%A IN (%ARTIFACTS_COMPILER%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\lib\%%A-%VERSION%-src.zip" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=zip -Dclassifier=src
+rem runtime java bin and source
+FOR %%A IN (%ARTIFACTS_RUNTIME_BINDING-JAVA%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\binding-java\lib\%%A-%VERSION%.jar" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=jar
+FOR %%A IN (%ARTIFACTS_RUNTIME_BINDING-JAVA%) DO CALL "%MVN%" install:install-file "-Dfile=%ETCH_HOME%\binding-java\lib\%%A-%VERSION%-src.zip" -DgroupId=%GROUP% -DartifactId=%%A -Dversion=%VERSION% -Dpackaging=zip -Dclassifier=src
Modified: incubator/etch/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/build.xml?rev=1000340&r1=1000339&r2=1000340&view=diff
==============================================================================
--- incubator/etch/trunk/util/build.xml (original)
+++ incubator/etch/trunk/util/build.xml Thu Sep 23 07:18:43 2010
@@ -50,7 +50,7 @@
<mkdir dir="${classesDirectory}/test" />
<javac debug="${Etch.javac.debug}"
- target="1.5"
+ target="1.5"
optimize="${Etch.javac.optimize}"
destdir="${classesDirectory}/main" >
<src path="${src}/main/java" />
@@ -59,7 +59,7 @@
</javac>
<javac debug="${Etch.javac.debug}"
- target="1.5"
+ target="1.5"
optimize="${Etch.javac.optimize}"
destdir="${classesDirectory}/test" >
<src path="${src}/test/java" />
@@ -78,7 +78,8 @@
<attribute name="dist" default="${Etch.support}" />
<sequential>
<mkdir dir="@{dist}/lib" />
-
+ <mkdir dir="@{dist}/binding-java/lib" />
+
<!-- CREATE jars -->
<!-- Package up etch-util jar -->
@@ -105,10 +106,10 @@
<attribute name="Version" value="${Etch.version}" />
</manifest>
</jar>
- <jar jarfile="@{dist}/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge">
+ <jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge">
<manifest>
<attribute name="Version" value="${Etch.version}" />
- </manifest>
+ </manifest>
</jar>
<!-- CREATE source archives -->
@@ -123,7 +124,7 @@
<mkdir dir="${target}/empty-dir" />
<zip destfile="@{dist}/lib/${etch-compiler-src.zip}" update="true" whenempty="create" basedir="${target}/empty-dir" />
- <zip destfile="@{dist}/lib/${etch-java-runtime-src.zip}" update="true" whenempty="create" basedir="${target}/empty-dir" />
+ <zip destfile="@{dist}/binding-java/${etch-java-runtime-src.zip}" update="true" whenempty="create" basedir="${target}/empty-dir" />
</sequential>
@@ -136,6 +137,7 @@
<sequential>
<!-- repackage .jar -->
<mkdir dir="@{dist}/lib" />
+ <mkdir dir="@{dist}/binding-java/lib" />
<delete dir="${target}/tmp-compiler" quiet="true" />
<mkdir dir="${target}/tmp-compiler" />
<delete dir="${target}/tmp-runtime" quiet="true" />
@@ -144,17 +146,18 @@
<unjar src="@{support}/lib/${etch-util.jar}" dest="${target}/tmp-compiler" />
<unjar src="@{support}/lib/${etch-compiler.jar}" dest="${target}/tmp-compiler" />
<unjar src="@{support}/lib/${etch-util.jar}" dest="${target}/tmp-runtime" />
- <unjar src="@{support}/lib/${etch-java-runtime.jar}" dest="${target}/tmp-runtime" />
+ <unjar src="@{support}/binding-java/lib/${etch-java-runtime.jar}" dest="${target}/tmp-runtime" />
<jar jarfile="@{dist}/lib/${etch-compiler.jar}" update="true" filesetmanifest="merge" >
- <fileset dir="${target}/tmp-compiler" />
+ <fileset dir="${target}/tmp-compiler" />
</jar>
- <jar jarfile="@{dist}/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge" >
- <fileset dir="${target}/tmp-runtime" />
+ <jar jarfile="@{dist}/binding-java/lib/${etch-java-runtime.jar}" update="true" filesetmanifest="merge" >
+ <fileset dir="${target}/tmp-runtime" />
</jar>
<!-- repackage .zip src -->
<mkdir dir="@{dist}/lib" />
+ <mkdir dir="@{dist}/binding-java/lib" />
<delete dir="${target}/tmp-compiler-src" quiet="true" />
<mkdir dir="${target}/tmp-compiler-src" />
<delete dir="${target}/tmp-runtime-src" quiet="true" />
@@ -163,12 +166,12 @@
<unzip src="@{support}/lib/${etch-util-src.zip}" dest="${target}/tmp-compiler-src" />
<unzip src="@{support}/lib/${etch-compiler-src.zip}" dest="${target}/tmp-compiler-src" />
<unzip src="@{support}/lib/${etch-util-src.zip}" dest="${target}/tmp-runtime-src" />
- <unzip src="@{support}/lib/${etch-java-runtime-src.zip}" dest="${target}/tmp-runtime-src" />
+ <unzip src="@{support}/binding-java/${etch-java-runtime-src.zip}" dest="${target}/tmp-runtime-src" />
<zip destfile="@{dist}/lib/${etch-compiler-src.zip}" >
<fileset dir="${target}/tmp-compiler-src" />
</zip>
- <zip destfile="@{dist}/lib/${etch-java-runtime-src.zip}" >
+ <zip destfile="@{dist}/binding-java/${etch-java-runtime-src.zip}" >
<fileset dir="${target}/tmp-runtime-src" />
</zip>