why? this is the same stuff i added to the 1.0.2 branch to update version strings w/ "-incubating", no java was harmed/touched in this commit. In fact the *.java / *cs in this commit are just auto-generated by the ant-build. You may freely overwrite them w/o harm.
Added: incubator/etch/trunk/NOTICE.txt (with props) Removed: incubator/etch/trunk/DIST_README.txt incubator/etch/trunk/ECLIPSE_USERS_README.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 On Wed, Jan 28, 2009 at 4:46 PM, scott comer <[email protected]> wrote: > did you really just commit something to trunk? we will need to back that > out. > > scott out > > [email protected] wrote: >> >> Author: dixson >> Date: Wed Jan 28 22:02:55 2009 >> New Revision: 738639 >> >> URL: http://svn.apache.org/viewvc?rev=738639&view=rev >> Log: >> >> * update version string to include "-incubating" and "apache-etch" where >> it seemed appropriate >> * collapsed all build-related .txt files into single 'BUILD.txt' >> * collapsed readme/reference .txt files into single 'README.txt' >> * added 'NOTICE.txt' >> * added 'LICENSE.txt' and 'NOTICE.txt' to the manifest of all generated >> .jar files >> >> >> Added: >> incubator/etch/trunk/NOTICE.txt (with props) >> Removed: >> incubator/etch/trunk/DIST_README.txt >> incubator/etch/trunk/ECLIPSE_USERS_README.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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/BUILD.txt (original) >> +++ incubator/etch/trunk/BUILD.txt Wed Jan 28 22:02:55 2009 >> @@ -1,7 +1,65 @@ >> +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: >> +To build the compiler core and the Java and XML bindings and Java-based >> examples, >> +you need the following: >> * Java JDK 1.5_011 or later >> * Apache Ant 1.7+ >> @@ -12,9 +70,8 @@ >> 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: >> @@ -24,22 +81,37 @@ >> Setup development environment >> ----------------------------- >> -1. Install JDK. Make certain that you set your JAVA_HOME environment >> variable to point to the correct location. >> +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. >> -Ant-based development >> ---------------------- >> +Building from ANT >> +----------------- >> 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. Update 'build.dependencies' with the correct paths to the jar's this >> project depends upon: >> +6. [IMPORTANT] 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) >> @@ -52,22 +124,130 @@ >> --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 >> ------ >> -At the shell prompt type: >> +7. 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/. >> +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. >> -Once complete, the dist tree can be found in 'target/Installers/dist'. >> Copy this directory manually to the desired install location. >> + Right click on the etch project, select Run as... / Junit test. >> -Using Eclipse >> -------------- >> +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). >> -See ECLIPSE_USERS_README.txt >> +You're done, start exploring. Check out examples, perf or chat. >> >> Modified: incubator/etch/trunk/Bamboo.bat >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/Bamboo.bat?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/Bamboo.bat (original) >> +++ incubator/etch/trunk/Bamboo.bat Wed Jan 28 22:02:55 2009 >> @@ -1,6 +1,8 @@ >> @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 >> >> Added: incubator/etch/trunk/NOTICE.txt >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/NOTICE.txt?rev=738639&view=auto >> >> ============================================================================== >> --- incubator/etch/trunk/NOTICE.txt (added) >> +++ incubator/etch/trunk/NOTICE.txt Wed Jan 28 22:02:55 2009 >> @@ -0,0 +1,8 @@ >> +Apache Etch (incubating) >> + >> +Copyright (C) 2008-2009 The Apache Software Foundation >> +Copyright (C) 2007-2008 Cisco Systems Inc. >> + >> +This product includes software developed at >> +The Apache Software Foundation (http://www.apache.org/). >> + >> >> Propchange: incubator/etch/trunk/NOTICE.txt >> >> ------------------------------------------------------------------------------ >> svn:eol-style = native >> >> Propchange: incubator/etch/trunk/NOTICE.txt >> >> ------------------------------------------------------------------------------ >> svn:keywords = "Author Date Id Revision" >> >> Modified: incubator/etch/trunk/README.txt >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/README.txt?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/README.txt (original) >> +++ incubator/etch/trunk/README.txt Wed Jan 28 22:02:55 2009 >> @@ -1,44 +1,87 @@ >> -Etch >> ----- >> +Welcome to the 1.0.2 release of Etch. >> -This is the source tree for Etch. It is organized as follows: >> +The jumping off point for Etch information and help is here: >> - 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. >> +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 >> >> Modified: incubator/etch/trunk/antsetup.bat >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/antsetup.bat?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/antsetup.bat (original) >> +++ incubator/etch/trunk/antsetup.bat Wed Jan 28 22:02:55 2009 >> @@ -2,7 +2,7 @@ >> # optional stuff may be omitted by prefixing every >> # line between the brackets with rem. >> -# look for additional information in build.dependencies. >> +# For information on building see BUILD.txt >> 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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/binding-csharp/compiler/build.xml (original) >> +++ incubator/etch/trunk/binding-csharp/compiler/build.xml Wed Jan 28 >> 22:02:55 2009 >> @@ -80,9 +80,14 @@ >> <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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 1.0.0 (LOCAL-0)"; >> + public String VERSION = "csharp apache-etch-1.1.0-incubating >> (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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 @EtchVersion@ (@EtchBuildTag@)"; >> + public String VERSION = "csharp @EtchLongName@ (@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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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("Etch C# Runtime DLL")] >> +[assembly: AssemblyDescription("Apache Etch C# Runtime DLL")] >> [assembly: AssemblyConfiguration("")] >> -[assembly: AssemblyCompany("Cisco Systems")] >> -[assembly: AssemblyProduct("Etch")] >> -[assembly: AssemblyCopyright("Copyright (c) Cisco Systems 2008")] >> +[assembly: AssemblyCompany("Apache Foundation")] >> +[assembly: AssemblyProduct("Apache Etch (incubating)")] >> +[assembly: AssemblyCopyright("Copyright (c) Apache Foundation 2009")] >> [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.0.0")] >> -[assembly: AssemblyFileVersion("1.0.0")] >> +[assembly: AssemblyVersion("1.1.0")] >> +[assembly: AssemblyFileVersion("apache-etch-1.1.0-incubating")] >> >> 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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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("Etch C# Runtime DLL")] >> +[assembly: AssemblyDescription("Apache Etch C# Runtime DLL")] >> [assembly: AssemblyConfiguration("")] >> -[assembly: AssemblyCompany("Cisco Systems")] >> -[assembly: AssemblyProduct("Etch")] >> -[assembly: AssemblyCopyright("Copyright (c) Cisco Systems 2008")] >> +[assembly: AssemblyCompany("Apache Foundation")] >> +[assembly: AssemblyProduct("Apache Etch (incubating)")] >> +[assembly: AssemblyCopyright("Copyright (c) Apache Foundation 2009")] >> [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("@EtchVersion@")] >> +[assembly: AssemblyFileVersion("@EtchLongName@")] >> >> Modified: incubator/etch/trunk/binding-java/compiler/build.xml >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/compiler/build.xml?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/binding-java/compiler/build.xml (original) >> +++ incubator/etch/trunk/binding-java/compiler/build.xml Wed Jan 28 >> 22:02:55 2009 >> @@ -80,9 +80,14 @@ >> <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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 1.0.0 (LOCAL-0)"; >> + public String VERSION = "java apache-etch-1.1.0-incubating >> (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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 @EtchVersion@ (@EtchBuildTag@)"; >> + public String VERSION = "java @EtchLongName@ (@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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/binding-xml/compiler/build.xml (original) >> +++ incubator/etch/trunk/binding-xml/compiler/build.xml Wed Jan 28 >> 22:02:55 2009 >> @@ -80,9 +80,14 @@ >> <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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 1.0.0 (LOCAL-0)"; >> + public String VERSION = "xml apache-etch-1.1.0-incubating >> (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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 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 @EtchVersion@ (@EtchBuildTag@)"; >> + public String VERSION = "xml @EtchLongName@ (@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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/build-support/etch.common.xml (original) >> +++ incubator/etch/trunk/build-support/etch.common.xml Wed Jan 28 22:02:55 >> 2009 >> @@ -39,7 +39,9 @@ >> <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" /> >> @@ -48,6 +50,8 @@ >> <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" /> >> @@ -77,6 +81,8 @@ >> <!-- 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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/compiler/build.xml (original) >> +++ incubator/etch/trunk/compiler/build.xml Wed Jan 28 22:02:55 2009 >> @@ -96,11 +96,16 @@ >> <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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 2009 >> @@ -23,5 +23,5 @@ >> public interface Version >> { >> /** The version of the Etch frontend (parser) */ >> - public String VERSION = "Etch 1.0.0 (LOCAL-0)"; >> + public String VERSION = "Apache Etch apache-etch-1.1.0-incubating >> (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=738639&r1=738638&r2=738639&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 >> Wed Jan 28 22:02:55 2009 >> @@ -23,5 +23,5 @@ >> public interface Version >> { >> /** The version of the Etch frontend (parser) */ >> - public String VERSION = "Etch @EtchVersion@ (@EtchBuildTag@)"; >> + public String VERSION = "Apache Etch @EtchLongName@ >> (@EtchBuildTag@)"; >> } >> >> Modified: incubator/etch/trunk/etch.properties >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/etch.properties?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/etch.properties (original) >> +++ incubator/etch/trunk/etch.properties Wed Jan 28 22:02:55 2009 >> @@ -1,3 +1,4 @@ >> majorVersion=1 >> -minorVersion=0 >> -patchVersion=2 >> +minorVersion=1 >> +patchVersion=0 >> +suffix=-incubating >> >> Modified: incubator/etch/trunk/installers/build.xml >> URL: >> http://svn.apache.org/viewvc/incubator/etch/trunk/installers/build.xml?rev=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/installers/build.xml (original) >> +++ incubator/etch/trunk/installers/build.xml Wed Jan 28 22:02:55 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-${Etch.version}" /> >> + <property name="packageName" value="${Etch.longname}" /> >> <!-- 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}/DIST_README.txt" >> tofile="${Etch.dist}/README.txt" /> >> + <copy file="${Etch.basedir}/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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/plugins/ant/build.xml (original) >> +++ incubator/etch/trunk/plugins/ant/build.xml Wed Jan 28 22:02:55 2009 >> @@ -79,10 +79,15 @@ >> <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=738639&r1=738638&r2=738639&view=diff >> >> ============================================================================== >> --- incubator/etch/trunk/util/build.xml (original) >> +++ incubator/etch/trunk/util/build.xml Wed Jan 28 22:02:55 2009 >> @@ -68,9 +68,15 @@ >> <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> >> >> >> > >
