You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by di...@apache.org on 2009/01/29 16:41:21 UTC
svn commit: r738897 - in /incubator/etch/trunk: ./ binding-csharp/compiler/
binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/
binding-csharp/runtime/src/main/csharp/Properties/ binding-java/compiler/
binding-java/compiler/src/main/ja...
Author: dixson
Date: Thu Jan 29 15:41:20 2009
New Revision: 738897
URL: http://svn.apache.org/viewvc?rev=738897&view=rev
Log:
Reverted to revision 738231
Added:
incubator/etch/trunk/DIST_README.txt
- copied unchanged from r738231, incubator/etch/trunk/DIST_README.txt
incubator/etch/trunk/ECLIPSE_USERS_README.txt
- copied unchanged from r738231, incubator/etch/trunk/ECLIPSE_USERS_README.txt
Removed:
incubator/etch/trunk/NOTICE.txt
Modified:
incubator/etch/trunk/BUILD.txt
incubator/etch/trunk/Bamboo.bat
incubator/etch/trunk/README.txt
incubator/etch/trunk/antsetup.bat
incubator/etch/trunk/binding-csharp/compiler/build.xml
incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java
incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java.tmpl
incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs
incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs.tmpl
incubator/etch/trunk/binding-java/compiler/build.xml
incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java
incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java.tmpl
incubator/etch/trunk/binding-xml/compiler/build.xml
incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java
incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java.tmpl
incubator/etch/trunk/build-support/etch.common.xml
incubator/etch/trunk/compiler/build.xml
incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java
incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl
incubator/etch/trunk/etch.properties
incubator/etch/trunk/installers/build.xml
incubator/etch/trunk/plugins/ant/build.xml
incubator/etch/trunk/util/build.xml
Modified: incubator/etch/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/BUILD.txt?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/BUILD.txt (original)
+++ incubator/etch/trunk/BUILD.txt Thu Jan 29 15:41:20 2009
@@ -1,65 +1,7 @@
-Build Instructions for Apache Etch
-==================================
-
-Contents
---------
- Source tree
- Dependencies
- Setup Development Environment
- Building from ANT
- Building from Eclipse
-
-
-Source tree
------------
-
-This is the source tree for Etch. It is organized as follows:
-
- build.xml - top-level ant build script
- build.dependecies - locations for jars this compile depends on
- etch.properties - static build properties
-
- compiler/ - core compiler
- build-support/ - common ant scripts shared by all modules
- plugins/ - extensions that embed the compiler, e.g. ant, maven, etc.
- scripts/ - common scripts for eclipse
- util/ - shared java classes
- tests/ - functional tests
- examples/ - Etch application examples
- chat/ - simple IM application
- distmap/ - example implementation of a distributed map in etch
- perf/ - etch client/server performance test
- example/ - minimal example
- installers/ - project for NSIS installer and tar.gz, .zip archives
-
- binding-xml - xml binding
- binding-java - java-language binding
- binding-csharp - C#-language binding
-
-
- About the Structure of Etch bindings
- ------------------------------------
-
-Each binding is factored into its own structure into the build tree. The intent
-is to provide an easy pattern for potential binding authors to emulate.
-Essentially each binding has two components:
-
- - compiler/
- - runtime/
-
-The 'compiler' is always implemented in Java and is coded to implement a
-backend interface for the target of choice.
-
-The 'runtime' is coded in the target language. The most useful language
-bindings implement identical functionality as the Java and C# bindings.
-Non-languages bindings (like binding-xml) may not have a runtime component
-at all.
-
Dependencies
------------
-To build the compiler core and the Java and XML bindings and Java-based examples,
-you need the following:
+To build the compiler core and the Java and XML bindings and Java-based examples:
* Java JDK 1.5_011 or later
* Apache Ant 1.7+
@@ -70,8 +12,9 @@
To compile the C# bindings and examples:
* Apache Ant DotNet 1.0
+ * Mono 1.9
+ - or -
* .NET Framework 2.0 (Visual Studio 2005)
- ** (Mono 1.9 support is experimental)
* NUnit 2.4.7
To compile NSIS installers:
@@ -81,37 +24,22 @@
Setup development environment
-----------------------------
-The primary development environments for the Etch committers are Win32 and
-*nix (Mac OS X). As such we have attempted to make the build process platform
-neutral. In addition, Etch builds are done daily on our internal Bamboo server
-here at Cisco on the win32 platform. This means that we tend to have a bias
-towards a working Win32 build. To further complicate matters, we have much
-development-environment divergence in our committer base, some of us being very
-shell-centric (dixson) while others of us being firmly rooted in Eclipse (sccomer).
-So the compromise has been to attempt to structure the build such it can be
-friendly and productive to both groups and keep the sectarian violence to
-a minimum. :-)
-
-1. Install JDK. Make certain that you set your JAVA_HOME environment variable
- to point to the correct location.
+1. Install JDK. Make certain that you set your JAVA_HOME environment variable to point to the correct location.
-Building from ANT
------------------
+Ant-based development
+---------------------
1. Install Apache ANT (version 1.7 or later).
2. Put /path/to/apache-ant-1.7/bin in your PATH.
-3. If you have Mono, make certain MONO_HOME is set correctly. If you have .NET
- framework, make certain msbuild.exe is in your PATH.
+3. If you have Mono, make certain MONO_HOME is set correctly. If you have .NET framework, make certain msbuild.exe is in your PATH.
4. If building C#, make certain NUNIT_HOME is set correctly.
-5. If building on Win32 and you want to build the NSIS installers, set
- NSIS_HOME to /path/to/nsis/2.23.
+5. If building on Win32 and you want to build the NSIS installers, set NSIS_HOME to /path/to/nsis/2.23.
-6. [IMPORTANT] Update 'build.dependencies' with the correct paths to the jar's
- this project depends upon:
+6. Update 'build.dependencies' with the correct paths to the jar's this project depends upon:
* javacc.home=/path/to/javacc-4.0
('${javacc.home}/bin/lib/javacc.jar' should exist)
@@ -124,130 +52,22 @@
--OPTIONAL--
* ant-dotnet.lib=/path/to/apache-ant-dotnet-1.0
+ ('${ant-dotnet.lib}/ant-dotnet-1.0.jar' should exist)
-(dixson) This is a hack until I get autoconf working. Just not there yet :-(
+Build
+-----
-7. At the shell prompt type:
+At the shell prompt type:
> ant release
-This will build all compilers and all the bindings for which you have setup
-dependencies. It will also build and run all unit/functional tests and build
-all the examples in examples/.
-
-Once complete, the dist tree can be found in 'target/Installers/dist'. Copy
-this directory manually to the desired install location.
-
-Building from Eclipse
----------------------
-
-After you checkout the project in eclipse, you will likely be told that there are
-build path problems. There are three dependent projects you need to get going with
-etch for eclipse, and one plugin:
-
- javacc 4.0
- ant 1.7.0
- junit 4.3.1
- velocity 1.5
-
-JavaCC is an eclipse plugin, get it from here:
-
- http://eclipse-javacc.sourceforge.net/
-
-On that page are directions to install the plugin from within eclipse. The other two
-you download:
-
- http://sourceforge.net/projects/junit/
- http://velocity.apache.org/engine/releases/velocity-1.5/
- http://archive.apache.org/dist/ant/binaries/
-
-NOTE: junit-4.3.1 is a hard dependency. Later versions of ant, JavaCC and Velocity may
-work, but later versions of JUnit will not (true as of etch-1.0.2).
-
-Once downloaded, you will need to create an environment variable (for example):
-
- ETCH_DEPENDENT_JARS=C:\workspace-etch\tools\velocity\1.5\velocity-dep-1.5.jar
-
-These are the extra jar files required to actually run the compiler. You will need
-to restart eclipse if it is running. Once eclipse is started, you will need to
-configure the Etch project:
-
- Right click on the etch project, and select Build Path / Configure Build Path
-
- Select the Libraries tab on the right.
-
- If ETCH_DEPENDENT_JARS is here, delete it.
-
- Select Add Library... on the right.
-
- Select User Library and click Next.
-
- Select User Libraries...
-
- Select New...
-
- Enter the name ETCH_DEPENDENT_JARS and click Ok.
-
- With ETCH_DEPENDENT_JARS selected, click Add JARs...
-
- Navigate to junit-4.3.1.jar and select it.
-
- With ETCH_DEPENDENT_JARS selected, click Add JARs... again...
-
- Navigate to velocity-dep-1.5.jar and select it.
-
- Navigate to ant.jar and select it.
-
- Click Ok.
-
- Click Finish.
-
- Click Ok.
-
-Eclipse should rebuild the project. There may still be errors, that's ok:
-
- Open Window / Preferences / Java / Compiler / Building.
-
- Expand Build path problems.
-
- Set Incomplete build path to be a warning.
-
- Set Circular dependencies to be an error.
-
- Set Incompatible required binaries to warning.
-
- Click Ok.
-
-Make sure JavaCC compiled EtchGrammar.jj. There should be a JavaCC console
-view open. If not, open it (Window / Show View / Other... / JavaCC console /
-JavaCC console).
-
-If JavaCC console is empty, Select Project / Clean... and clean all projects.
-A few JavaCC messages should appear. It is ok if JavaCC warns about creating
-a directory.
-
-Now that the compiler is built, you will still have errors for etch build
-products which are missing. you will need to recompile all the etch files.
-You can do this by:
-
- Select the etch project.
-
- Select Run / External Tools / Compile Java Etch Files.
-
-(You may want to configure the external tools first. Select Run / External
-Tools / Organize Favorites... Click Add... Select All. Ok. Ok.)
-
-You should see a nice output in the Console reporting successful compilation
-of a bunch of etch files. Eclipse should then rebuilt the project.
-
-Finally, you can check things out by running the unit tests.
+This will build all compilers and all the bindings for which you have setup dependencies. It will also build and run all unit/functional tests and build all the examples in examples/.
- Right click on the etch project, select Run as... / Junit test.
+Once complete, the dist tree can be found in 'target/Installers/dist'. Copy this directory manually to the desired install location.
-You'll get some output on the console window, including scary looking stack
-traces. That's ok. JUnit runner should tell you that 1197 tests passed, 22
-ignored, with 0 errors and 0 failures. This takes 66 seconds for me (sccomer).
+Using Eclipse
+-------------
-You're done, start exploring. Check out examples, perf or chat.
+See ECLIPSE_USERS_README.txt
Modified: incubator/etch/trunk/Bamboo.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/Bamboo.bat?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/Bamboo.bat (original)
+++ incubator/etch/trunk/Bamboo.bat Thu Jan 29 15:41:20 2009
@@ -1,8 +1,6 @@
@echo off
:: This batch file is a wrapper so that we can set up our environment, and then
:: kick off a build in bamboo
-:: (dixson) this really only useful in the Etch committers build-env
-
:: Run our env setup script
call %TOOLS_DIR%\Environment.bat -qnc -p ETCH
Modified: incubator/etch/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/README.txt?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/README.txt (original)
+++ incubator/etch/trunk/README.txt Thu Jan 29 15:41:20 2009
@@ -1,87 +1,44 @@
-Welcome to the 1.0.2 release of Etch.
+Etch
+----
-The jumping off point for Etch information and help is here:
+This is the source tree for Etch. It is organized as follows:
-http://cwiki.apache.org/ETCH
-
-The top-level structure of the install image is:
-
- ChangeLog.txt
- LICENSE.txt
- README.txt
- bin
- lib
- maven
-
-Please take a moment to review the ChangeLog.txt and LICENSE.txt files.
-
-The Windows installer (etch-1.0.2-setup.exe) has created a user environment
-variable (ETCH_HOME) which points to the Etch installation directory. If you
-installed Etch using either etch-1.0.2.tar.gz or etch-1.0.2.zip, you will want
-to create this environment variable yourself:
-
-windows:
- set ETCH_HOME=C:\Program Files\Etch\etch-1.0.2
-
-unix:
- export ETCH_HOME=/usr/local/etch/etch-1.0.2
-
-The bin directory has also been put on your path by the Windows installer. If
-you are using the archives, you will need to do this yourself:
-
-windows:
- PATH %PATH%;%ETCH_HOME%\bin
-
-unix:
- PATH="$PATH:$ETCH_HOME/bin"
-
-The bin directory contains a Windows bat script and a unix shell script.
-
-You will also need to have a java sdk installed (later versions of 1.5 or
-any version of 1.6). A JAVA_HOME environment variable should point to the
-installation directory of the java sdk.
-
-In the end, at a command line or shell, you should be able to run the etch
-compiler and see some basic output:
-
-windows:
- C:\>etch
- etch: option '-b binding' must be specified on the command line
-
-unix:
- bash-3.2$ etch
- etch: option '-b binding' must be specified on the command line
-
-The lib directory contains the various jar files, zipped sources, and a C# dll:
-
- Etch.dll
- etch-ant-plugin-1.0.2-src.zip
- etch-ant-plugin-1.0.2.jar
- etch-java-runtime-1.0.2-src.zip
- etch-java-runtime-1.0.2.jar
- ...
-
-The main items of interest are the java binding runtime, which you need to
-put on the classpath of your projects: etch-java-runtime-1.0.2.jar. There is
-source code to go with it in etch-java-runtime-1.0.2-src.zip.
-
-The C# (.NET 2.0) Etch.dll should be added to any C# projects.
-
-There is an ant plugin which you can use with ant 1.7.0 or later to invoke the
-compiler as a task. It is documented on the wiki referenced above.
-
-If you are using maven, then you might want to install the Etch artifacts into
-your local maven repository. There is a Windows bat script to do this in the
-maven directory:
-
- etch-maven-install.bat
-
-You need to have maven on your path when you run this script. The file
-etch-java-runtime-1.0.2.jar will be installed into your local repository with
-group "etch.etch", artifact id "etch-java-runtime", and version "1.0.2". You
-may then reference Etch from your maven projects.
-
-Examples and unit tests can be had by checking out the source code from the
-subversion repository and performing a complete build:
-
- https://svn.apache.org/repos/asf/incubator/etch
+ build.xml - top-level ant build script
+ build.dependecies - locations for jars this compile depends on
+ etch.properties - static build properties
+
+ compiler/ - core compiler
+ build-support/ - common ant scripts shared by all modules
+ plugins/ - extensions that embed the compiler, e.g. ant, maven, etc.
+ scripts/ - common scripts for eclipse
+ util/ - shared java classes
+ tests/ - functional tests
+ examples/ - Etch application examples
+ chat/ - simple IM application
+ distmap/ - example implementation of a distributed map in etch
+ perf/ - etch client/server performance test
+ example/ - minimal example
+ installers/ - project for NSIS installer and tar.gz, .zip archives
+
+ binding-xml - xml binding
+ binding-java - java-language binding
+ binding-csharp - C#-language binding
+
+
+Etch bindings
+-------------
+
+Each binding is factored into its own structure into the build tree. The intent
+is to provide an easy pattern for potential binding authors to emulate.
+Essentially each binding has two components:
+
+ - compiler/
+ - runtime/
+
+The 'compiler' is always implemented in Java and is coded to implement a
+backend interface for the target of choice.
+
+The 'runtime' is coded in the target language. The most useful language
+bindings implement identical functionality as the Java and C# bindings.
+Non-languages bindings (like binding-xml) may not have a runtime component
+at all.
Modified: incubator/etch/trunk/antsetup.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/antsetup.bat?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/antsetup.bat (original)
+++ incubator/etch/trunk/antsetup.bat Thu Jan 29 15:41:20 2009
@@ -2,7 +2,7 @@
# optional stuff may be omitted by prefixing every
# line between the brackets with rem.
-# For information on building see BUILD.txt
+# look for additional information in build.dependencies.
rem -- java builds --
Modified: incubator/etch/trunk/binding-csharp/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/compiler/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/compiler/build.xml (original)
+++ incubator/etch/trunk/binding-csharp/compiler/build.xml Thu Jan 29 15:41:20 2009
@@ -80,14 +80,9 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
- <metainf dir="${Etch.basedir}" >
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
<fileset dir="${classesDirectory}/main">
<include name="etch/bindings/**" />
<!-- <include name="resources/**" /> -->
Modified: incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java (original)
+++ incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "csharp apache-etch-1.1.0-incubating (LOCAL-0)";
+ public String VERSION = "csharp 1.0.0 (LOCAL-0)";
}
Modified: incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java.tmpl?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java.tmpl (original)
+++ incubator/etch/trunk/binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java.tmpl Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "csharp @EtchLongName@ (@EtchBuildTag@)";
+ public String VERSION = "csharp @EtchVersion@ (@EtchBuildTag@)";
}
Modified: incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs (original)
+++ incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs Thu Jan 29 15:41:20 2009
@@ -6,11 +6,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Etch")]
-[assembly: AssemblyDescription("Apache Etch C# Runtime DLL")]
+[assembly: AssemblyDescription("Etch C# Runtime DLL")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Foundation")]
-[assembly: AssemblyProduct("Apache Etch (incubating)")]
-[assembly: AssemblyCopyright("Copyright © Apache Foundation 2009")]
+[assembly: AssemblyCompany("Cisco Systems")]
+[assembly: AssemblyProduct("Etch")]
+[assembly: AssemblyCopyright("Copyright © Cisco Systems 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("apache-etch-1.1.0-incubating")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
Modified: incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs.tmpl?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs.tmpl (original)
+++ incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs.tmpl Thu Jan 29 15:41:20 2009
@@ -6,11 +6,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Etch")]
-[assembly: AssemblyDescription("Apache Etch C# Runtime DLL")]
+[assembly: AssemblyDescription("Etch C# Runtime DLL")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Foundation")]
-[assembly: AssemblyProduct("Apache Etch (incubating)")]
-[assembly: AssemblyCopyright("Copyright © Apache Foundation 2009")]
+[assembly: AssemblyCompany("Cisco Systems")]
+[assembly: AssemblyProduct("Etch")]
+[assembly: AssemblyCopyright("Copyright © Cisco Systems 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("@EtchVersion@")]
-[assembly: AssemblyFileVersion("@EtchLongName@")]
+[assembly: AssemblyFileVersion("@EtchVersion@")]
Modified: incubator/etch/trunk/binding-java/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/compiler/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/compiler/build.xml (original)
+++ incubator/etch/trunk/binding-java/compiler/build.xml Thu Jan 29 15:41:20 2009
@@ -80,14 +80,9 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
- <metainf dir="${Etch.basedir}" >
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
<fileset dir="${classesDirectory}/main">
<include name="etch/bindings/**" />
<!-- <include name="resources/**" /> -->
Modified: incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java (original)
+++ incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "java apache-etch-1.1.0-incubating (LOCAL-0)";
+ public String VERSION = "java 1.0.0 (LOCAL-0)";
}
Modified: incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java.tmpl?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java.tmpl (original)
+++ incubator/etch/trunk/binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java.tmpl Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "java @EtchLongName@ (@EtchBuildTag@)";
+ public String VERSION = "java @EtchVersion@ (@EtchBuildTag@)";
}
Modified: incubator/etch/trunk/binding-xml/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/build.xml (original)
+++ incubator/etch/trunk/binding-xml/compiler/build.xml Thu Jan 29 15:41:20 2009
@@ -80,14 +80,9 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
- <metainf dir="${Etch.basedir}" >
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
<fileset dir="${classesDirectory}/main">
<include name="etch/bindings/**" />
<!-- <include name="resources/**" /> -->
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "xml apache-etch-1.1.0-incubating (LOCAL-0)";
+ public String VERSION = "xml 1.0.0 (LOCAL-0)";
}
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java.tmpl?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java.tmpl (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java.tmpl Thu Jan 29 15:41:20 2009
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "xml @EtchLongName@ (@EtchBuildTag@)";
+ public String VERSION = "xml @EtchVersion@ (@EtchBuildTag@)";
}
Modified: incubator/etch/trunk/build-support/etch.common.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.common.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.common.xml (original)
+++ incubator/etch/trunk/build-support/etch.common.xml Thu Jan 29 15:41:20 2009
@@ -39,9 +39,7 @@
<condition property="Etch.runtime.revisionNumber" value="0" >
<not><isset property="Etch.runtime.revisionNumber" /></not>
</condition>
- <condition property="Etch.property.suffix" value="" >
- <not><isset property="Etch.property.suffix" /></not>
- </condition>
+
<property name="Etch.target" location="${Etch.basedir}/target" />
<property name="Etch.dist" location="${Etch.target}/Installers/dist" />
@@ -50,8 +48,6 @@
<property name="Etch.clover-support" location="${Etch.target}/Support/dist-clover" />
<property name="Etch.version" value="${Etch.property.majorVersion}.${Etch.property.minorVersion}.${Etch.property.patchVersion}" />
- <property name="Etch.longversion" value="${Etch.version}${Etch.property.suffix}" />
- <property name="Etch.longname" value="apache-etch-${Etch.longversion}" />
<property name="Etch.shortversion" value="${Etch.property.majorVersion}.${Etch.property.minorVersion}" />
<property name="Etch.buildTag" value="${Etch.runtime.buildKey}-${Etch.runtime.buildNumber}" />
<property name="Etch.buildSupportDirectory" location="${Etch.basedir}/build-support" />
@@ -81,8 +77,6 @@
<!-- Define filterset for build-time substitutions -->
<filterset id="Etch.buildTokens" >
<filter token="EtchVersion" value="${Etch.version}" />
- <filter token="EtchLongVersion" value="${Etch.longversion}" />
- <filter token="EtchLongName" value="${Etch.longname}" />
<filter token="EtchBuildTag" value="${Etch.buildTag}" />
<filter token="EtchRuntimeRevisionNumber" value="${Etch.runtime.revisionNumber}" />
<filter token="EtchRuntimeBuildKey" value="${Etch.runtime.buildKey}" />
Modified: incubator/etch/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/build.xml (original)
+++ incubator/etch/trunk/compiler/build.xml Thu Jan 29 15:41:20 2009
@@ -96,16 +96,11 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
<attribute name="Class-Path" value="${etch-util.jar}" />
<attribute name="Main-Class" value="etch.compiler.EtchMain" />
</manifest>
- <metainf dir="${Etch.basedir}" >
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
<fileset dir="${classesDirectory}/main">
<include name="etch/compiler/**" />
<!-- <include name="resources/**" /> -->
Modified: incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java Thu Jan 29 15:41:20 2009
@@ -23,5 +23,5 @@
public interface Version
{
/** The version of the Etch frontend (parser) */
- public String VERSION = "Apache Etch apache-etch-1.1.0-incubating (LOCAL-0)";
+ public String VERSION = "Etch 1.0.0 (LOCAL-0)";
}
Modified: incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl (original)
+++ incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl Thu Jan 29 15:41:20 2009
@@ -23,5 +23,5 @@
public interface Version
{
/** The version of the Etch frontend (parser) */
- public String VERSION = "Apache Etch @EtchLongName@ (@EtchBuildTag@)";
+ public String VERSION = "Etch @EtchVersion@ (@EtchBuildTag@)";
}
Modified: incubator/etch/trunk/etch.properties
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/etch.properties?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/etch.properties (original)
+++ incubator/etch/trunk/etch.properties Thu Jan 29 15:41:20 2009
@@ -1,4 +1,3 @@
majorVersion=1
-minorVersion=1
-patchVersion=0
-suffix=-incubating
+minorVersion=0
+patchVersion=2
Modified: incubator/etch/trunk/installers/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/installers/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/installers/build.xml (original)
+++ incubator/etch/trunk/installers/build.xml Thu Jan 29 15:41:20 2009
@@ -7,7 +7,7 @@
<!-- Static properties of the sub-project -->
<property name="proj" location="${Etch.basedir}/installers" />
<property name="target" location="${proj}/target" />
- <property name="packageName" value="${Etch.longname}" />
+ <property name="packageName" value="etch-${Etch.version}" />
<!-- INIT TARGET -->
<!-- Modify this target to define project specific properties that can only be set at runtime -->
@@ -27,7 +27,7 @@
<target name="do-txts">
<copy file="${Etch.basedir}/LICENSE.txt" todir="${Etch.dist}" />
<copy file="${Etch.basedir}/ChangeLog.txt" todir="${Etch.dist}" />
- <copy file="${Etch.basedir}/README.txt" tofile="${Etch.dist}/README.txt" />
+ <copy file="${Etch.basedir}/DIST_README.txt" tofile="${Etch.dist}/README.txt" />
<copy file="${proj}/etch-maven-install.bat" todir="${Etch.dist}/maven" >
<filterset refid="Etch.buildTokens" />
</copy>
Modified: incubator/etch/trunk/plugins/ant/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/build.xml (original)
+++ incubator/etch/trunk/plugins/ant/build.xml Thu Jan 29 15:41:20 2009
@@ -79,15 +79,10 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
<attribute name="Class-Path" value="${etch-compiler.jar}" />
</manifest>
- <metainf dir="${Etch.basedir}">
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
<fileset dir="${classesDirectory}/main"/>
</jar>
Modified: incubator/etch/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/build.xml?rev=738897&r1=738896&r2=738897&view=diff
==============================================================================
--- incubator/etch/trunk/util/build.xml (original)
+++ incubator/etch/trunk/util/build.xml Thu Jan 29 15:41:20 2009
@@ -68,15 +68,9 @@
<manifest>
<attribute name="Copyright" value="${Etch.copyrightNotice}" />
<attribute name="Version" value="${Etch.version}" />
- <attribute name="LongVersion" value="${Etch.longversion}" />
<attribute name="Build-Tag" value="${Etch.buildTag}" />
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
- <metainf dir="${Etch.basedir}" >
- <include name="NOTICE.txt" />
- <include name="LICENSE.txt" />
- </metainf>
-
<fileset dir="${classesDirectory}/main">
<include name="etch/util/**" />
</fileset>