You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/08/17 03:53:13 UTC
svn commit: r432103 - in /incubator/harmony/enhanced/drlvm/trunk/build: ./
make/ make/components/ make/components/extra/ make/components/vm/
make/targets/ patches/
patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/
Author: ndbeyer
Date: Wed Aug 16 18:53:11 2006
New Revision: 432103
URL: http://svn.apache.org/viewvc?rev=432103&view=rev
Log:
Set svn:eol-style = native for build.
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/README.txt (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/build/build.bat (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/build/build.sh (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/build_component.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/build_component.xsl (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apriconv.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hyplugin.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/jre_libraries.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/get_antcontrib.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/selector.xsl (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt (contents, props changed)
incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyVMRunner.java (props changed)
incubator/harmony/enhanced/drlvm/trunk/build/patches/hyplugin.patch (props changed)
Modified: incubator/harmony/enhanced/drlvm/trunk/build/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/README.txt?rev=432103&r1=432102&r2=432103&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/README.txt (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/README.txt Wed Aug 16 18:53:11 2006
@@ -1,19 +1,19 @@
-
- BUILD SYSTEM for the DRLVM project
- ==================================
-
-Note :
-
-Please be sure to checkout and build the Harmony classlibrary first.
-
-Then, point DRLVM to the built classlibrary via the
-
- external.dep.CLASSLIB
-
-property in build.xml
-
-
-For generic instructions how to build DRLVM, please refer to ../README.txt file.
-
-For details on the building system and information on how to add new components
-into the build, please refer to the make/components/README.txt.
+
+ BUILD SYSTEM for the DRLVM project
+ ==================================
+
+Note :
+
+Please be sure to checkout and build the Harmony classlibrary first.
+
+Then, point DRLVM to the built classlibrary via the
+
+ external.dep.CLASSLIB
+
+property in build.xml
+
+
+For generic instructions how to build DRLVM, please refer to ../README.txt file.
+
+For details on the building system and information on how to add new components
+into the build, please refer to the make/components/README.txt.
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.bat
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.bat?rev=432103&r1=432102&r2=432103&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.bat (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.bat Wed Aug 16 18:53:11 2006
@@ -1,146 +1,146 @@
-@ECHO OFF
-
-rem Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
-rem
-rem Licensed under the Apache License, Version 2.0 (the "License");
-rem you may not use this file except in compliance with the License.
-rem You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-REM
-REM @author: Sergey V. Dmitriev
-REM @version: $Revision: 1.9.2.12 $
-REM
-
-REM This file is a Windows command line interface to the Harmony build.
-REM It checks the installed software, required tools and external resources
-REM and then executes Ant.
-REM The locations for all external resources are defined in make/win.properties file.
-REM They can be altered via appropriate environment variables.
-REM See win.properties for variable descriptions.
-
-SETLOCAL
-
-REM ================================================
-REM Check environment variables.
-REM
-REM For the quick start, build needs the following
-REM variables to be set:
-REM JAVA_HOME = <Path to 1.4-compatible JRE>
-REM ANT_HOME = <Path to Apache Ant 1.6.5>
-REM COMPILER_CFG_SCRIPT = <Whatever script that is configuring environment for C/C++ compiler>
-REM ================================================
-
-
-REM Script for configuring C/C++ compiler, Intel C compiler by default.
-
-IF DEFINED COMPILER_CFG_SCRIPT GOTO CONFIG
-
-IF "%CXX%" == "msvc" (
- IF EXIST "C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd" (
- SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd
- ) ELSE IF EXIST "C:\Program Files\Microsoft SDK\SetEnv.bat" (
- SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft SDK\SetEnv.bat
- ) ELSE IF EXIST "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat" (
- SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
- ) ELSE IF EXIST "c:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" (
- SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT
- )
-
- IF "%BUILD_CFG%" == "release" (
- SET COMPILER_CFG_ARG=/RETAIL
- ) ELSE (
- SET COMPILER_CFG_ARG=/DEBUG
- )
-
-) ELSE (
- IF NOT DEFINED VS71COMNTOOLS (
- IF EXIST "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools" (
- SET VS71COMNTOOLS=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\
- )
- )
-
- IF EXIST "C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat" (
- SET COMPILER_CFG_SCRIPT=C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat
- )
-)
-
-IF NOT DEFINED COMPILER_CFG_SCRIPT (
- ECHO error: Cannot guess the location of compiler configuration script
- ECHO Please set COMPILER_CFG_SCRIPT and/or CXX
- GOTO ERROR
-)
-
-:CONFIG
-ECHO ON
-CALL "%COMPILER_CFG_SCRIPT%" %COMPILER_CFG_ARG%
-@ECHO OFF
-
-IF NOT %ERRORLEVEL% == 0 (
- ECHO *
- ECHO * Failed to call C compiler configuration script:
- ECHO * %COMPILER_CFG_SCRIPT%
- ECHO *
- GOTO ERROR
- )
-
-REM ================================================
-REM Check JAVA_HOME & ANT_HOME
-REM ================================================
-
-IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
- IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
- ECHO * Neigher "%JAVA_HOME%\bin\java.exe" nor "%JAVA_HOME%\bin\java.exe" found.
- ECHO * Make sure you have Harmony JRE or DRLVM installed on your computer and that
- ECHO * JAVA_HOME environment variable points out to its installation dir, e.g.
- ECHO * SET JAVA_HOME=c:\jre
- GOTO ERROR
- )
-)
-
-IF NOT EXIST "%ANT_HOME%\bin\ant.bat" (
- ECHO * File %ANT_HOME%\bin\ant.bat not found.
- ECHO * Make sure you have Ant 1.6.5 or above installed from
- ECHO * http://ant.apache.org/bindownload.cgi and the ANT_HOME environment
- ECHO * variable points to the Ant installation dir, e.g.
- ECHO * SET ANT_HOME=c:\ant_1.6.5
- GOTO ERROR
-)
-
-
-SET CLASSPATH=
-
-REM ===================
-REM Executing Ant build
-REM ===================
-
-SET CLASSPATH=%CD%\make\tmp\cpptasks.jar
-SET CLASSPATH=%CLASSPATH%;.\make\tmp\org.eclipse.jdt.core_3.1.1.jar
-SET CLASSPATH=%CLASSPATH%;.\make\tmp\jdtCompilerAdapter.jar
-SET CLASSPATH=%CLASSPATH%;.\make\tmp\junit.jar
-SET CLASSPATH=%CLASSPATH%;.\make\tmp\xalan.jar
-
-SET CLASSPATH=%CD%\make\tmp\cpptasks\patched.classes;%CLASSPATH%
-SET CLASSPATH=.\make\tmp\ant-contrib.jar;%CLASSPATH%
-
-SET ANT_COMMAND=%ANT_HOME%\bin\ant.bat
-
-REM Note: vm.jitrino is always complied in release mode, otherwise it makes VM debug too slow
-CALL "%ANT_COMMAND%" -f make/build.xml -Dvm.jitrino.cfg=release %*
-
-GOTO THEEND
-
-:ERROR
-ECHO *
-ECHO * Please, refer to README.txt for details.
-ECHO *
-EXIT /B 1
-
-:THEEND
+@ECHO OFF
+
+rem Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+REM
+REM @author: Sergey V. Dmitriev
+REM @version: $Revision: 1.9.2.12 $
+REM
+
+REM This file is a Windows command line interface to the Harmony build.
+REM It checks the installed software, required tools and external resources
+REM and then executes Ant.
+REM The locations for all external resources are defined in make/win.properties file.
+REM They can be altered via appropriate environment variables.
+REM See win.properties for variable descriptions.
+
+SETLOCAL
+
+REM ================================================
+REM Check environment variables.
+REM
+REM For the quick start, build needs the following
+REM variables to be set:
+REM JAVA_HOME = <Path to 1.4-compatible JRE>
+REM ANT_HOME = <Path to Apache Ant 1.6.5>
+REM COMPILER_CFG_SCRIPT = <Whatever script that is configuring environment for C/C++ compiler>
+REM ================================================
+
+
+REM Script for configuring C/C++ compiler, Intel C compiler by default.
+
+IF DEFINED COMPILER_CFG_SCRIPT GOTO CONFIG
+
+IF "%CXX%" == "msvc" (
+ IF EXIST "C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd" (
+ SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd
+ ) ELSE IF EXIST "C:\Program Files\Microsoft SDK\SetEnv.bat" (
+ SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft SDK\SetEnv.bat
+ ) ELSE IF EXIST "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat" (
+ SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
+ ) ELSE IF EXIST "c:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" (
+ SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT
+ )
+
+ IF "%BUILD_CFG%" == "release" (
+ SET COMPILER_CFG_ARG=/RETAIL
+ ) ELSE (
+ SET COMPILER_CFG_ARG=/DEBUG
+ )
+
+) ELSE (
+ IF NOT DEFINED VS71COMNTOOLS (
+ IF EXIST "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools" (
+ SET VS71COMNTOOLS=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\
+ )
+ )
+
+ IF EXIST "C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat" (
+ SET COMPILER_CFG_SCRIPT=C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat
+ )
+)
+
+IF NOT DEFINED COMPILER_CFG_SCRIPT (
+ ECHO error: Cannot guess the location of compiler configuration script
+ ECHO Please set COMPILER_CFG_SCRIPT and/or CXX
+ GOTO ERROR
+)
+
+:CONFIG
+ECHO ON
+CALL "%COMPILER_CFG_SCRIPT%" %COMPILER_CFG_ARG%
+@ECHO OFF
+
+IF NOT %ERRORLEVEL% == 0 (
+ ECHO *
+ ECHO * Failed to call C compiler configuration script:
+ ECHO * %COMPILER_CFG_SCRIPT%
+ ECHO *
+ GOTO ERROR
+ )
+
+REM ================================================
+REM Check JAVA_HOME & ANT_HOME
+REM ================================================
+
+IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
+ IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
+ ECHO * Neigher "%JAVA_HOME%\bin\java.exe" nor "%JAVA_HOME%\bin\java.exe" found.
+ ECHO * Make sure you have Harmony JRE or DRLVM installed on your computer and that
+ ECHO * JAVA_HOME environment variable points out to its installation dir, e.g.
+ ECHO * SET JAVA_HOME=c:\jre
+ GOTO ERROR
+ )
+)
+
+IF NOT EXIST "%ANT_HOME%\bin\ant.bat" (
+ ECHO * File %ANT_HOME%\bin\ant.bat not found.
+ ECHO * Make sure you have Ant 1.6.5 or above installed from
+ ECHO * http://ant.apache.org/bindownload.cgi and the ANT_HOME environment
+ ECHO * variable points to the Ant installation dir, e.g.
+ ECHO * SET ANT_HOME=c:\ant_1.6.5
+ GOTO ERROR
+)
+
+
+SET CLASSPATH=
+
+REM ===================
+REM Executing Ant build
+REM ===================
+
+SET CLASSPATH=%CD%\make\tmp\cpptasks.jar
+SET CLASSPATH=%CLASSPATH%;.\make\tmp\org.eclipse.jdt.core_3.1.1.jar
+SET CLASSPATH=%CLASSPATH%;.\make\tmp\jdtCompilerAdapter.jar
+SET CLASSPATH=%CLASSPATH%;.\make\tmp\junit.jar
+SET CLASSPATH=%CLASSPATH%;.\make\tmp\xalan.jar
+
+SET CLASSPATH=%CD%\make\tmp\cpptasks\patched.classes;%CLASSPATH%
+SET CLASSPATH=.\make\tmp\ant-contrib.jar;%CLASSPATH%
+
+SET ANT_COMMAND=%ANT_HOME%\bin\ant.bat
+
+REM Note: vm.jitrino is always complied in release mode, otherwise it makes VM debug too slow
+CALL "%ANT_COMMAND%" -f make/build.xml -Dvm.jitrino.cfg=release %*
+
+GOTO THEEND
+
+:ERROR
+ECHO *
+ECHO * Please, refer to README.txt for details.
+ECHO *
+EXIT /B 1
+
+:THEEND
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/build.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/build_component.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/build_component.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt?rev=432103&r1=432102&r2=432103&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt Wed Aug 16 18:53:11 2006
@@ -1,413 +1,413 @@
-
-
- HOW TO ADD A NEW COMPONENT TO THE BUILD
- =======================================
-
-I. INTRODUCTION
----------------
-
- The build provided with DRLVM has the following structure:
-
- make/
- |
- +--- setup.xml
- | first entry point: downloads, prepares and checks the necessary
- | external resources
- |
- +--- get_antcontrib.xml
- | used from setup.xml: gets ant-contrib from an external location
- | and prepares it to be used by Ant
- |
- +--- build.xml
- | second entry point: main build file
- |
- +--- deploy.xml
- | describes the content of the product
- |
- +--- build_component.xml
- | build 'core': generates and executes build file for
- | each component
- |
- +--- build_component.xsl
- | xslt used for pre-processing of component descriptors
- |
- +--- selector.xsl
- | xslt used for attribute-based filtering of XML content
- |
- +--- ant/
- | stub for the Ant Splash task that
- | eliminates the dependency on Swing
- |
- +--- components/
- | contains descriptors for components
- |
- +--- targets/
- contains target templates and shared settings for
- components
-
- Each component in the product is described with an Ant-based XML descriptor.
- To add a new component, you need to create a descriptor for it.
- The component is defined as follows:
-
- - A component is a more or less distinct part of product.
-
- - A component can contain several types of source:
- C++ sources, C sources, assembler sources, Java* sources, smoke
- and unit tests.
-
- - A component can be processed in several ways in the build:
- produce native output (shared or static library or executable)
- and/or Java* classes in .jar file, produce and run smoke and/or unit tests.
-
- The build dynamically produces a build_${component}.xml file for
- each specific component by taking its descriptor, performing the
- attribute-based filtering on it, and then applying target templates
- and settings on it.
-
-
-II. HOW TO DEVELOP A COMPONENT DESCRIPTOR
------------------------------------------
-
- Each descriptor is placed in the components/ directory and
- follows the structure described below:
-
- 1. Component build descriptor must be formed in the project with
- the corresponding name and nested target with a fixed name.
- Example with the name init:
-
- <project name="component_name" >
- <target name="init">
- ...
- </target>
- </project>
-
- 2. Inside the mentioned project and target tags, the
- descriptor must follow the following structure:
-
- - Native part:
- - Common description:
- - The property "libname" represents the native output
- (shared/static library or executable) file name,
- specified without the extention, for example,
-
- <property name="libname" value="lang" />
-
- - The property "outtype" represents the native output type
- ("shared", "static" or "executable").
- Example:
- <property name="outtype" value="shared" />
-
- - C compilation related description:
- The compiler definition with id="c.compiler" represents
- the C-related resources: the source path file set, the directory
- set of include files, compiler arguments, and define
- sets. Example:
-
- <compiler id="c.compiler" extends="comm.cpp.compiler">
- <includepath>
- <dirset dir="${src}" >
- <include name="src\api" />
- </dirset>
- </includepath>
- <fileset dir="${src}">
- <include name="src/vm/*.c" />
- </fileset>
- <compilerarg value="/WX" />
- <defineset define="DEBUG" />
- </compiler>
-
- - C++ compilation related description:
- The compiler definition with id="cpp.compiler" represents
- the C++-related resources: the source path file set, the directory
- set of include files, compiler arguments, and define
- sets. Example:
-
- <compiler id="cpp.compiler" extends="common.cpp.compiler">
- <includepath>
- <dirset dir="${src}" >
- <include name="src/api" />
- </dirset>
- </includepath>
- <fileset dir="${src}">
- <include name="src/vm/*.cpp" />
- </fileset>
- <compilerarg value="/WX" />
- <defineset define="DEBUG" />
- </compiler>
-
- - Assembler compilation description:
- The description represents the assembler source file set
- and compiler arguments. Example:
-
- <fileset id="asm.fileset" dir="${src}">
- <include name="vmcore/src/thread/atomic.asm" />
- </fileset>
- <property name="asm.args" value="-Wa" />
-
- - Linker-related description:
- The description represents the library set and linker arguments.
- NOTE: You need not include object files produced in the native part;
- they will be passed to the linker automatically.
- Example:
-
- <linker id="linker" extends="common.linker">
- <linkerarg value="--export-dynamic" />
- <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
- <syslibset libs="advapi32,userenv,ws2_32,vmcore,odbc32,mswsock" />
- <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
- </linker>
-
- - Java* part:
- - The property "jarname" represents the output .jar file name
- with compiled Java* classes with no file extention specified.
- Example:
-
- <property name="jarname" value="kernel.jar" />
-
- - Java* source file set description.
- Example:
-
- <path id="java.source">
- <pathelement location="${build.vm.home}/vmcore/src/kernel_classes/javasrc" />
- </path>
-
- - Java* source files pattern: files to pass to javac
- Example:
-
- <patternset id="java.source.pattern" includes="**/*.java"/>
-
- - Java* class files pattern: files to pack into the .jar file
- Example:
-
- <patternset id="java.classes.pattern" includes="**/*.class"/>
-
- - Java* class path used as the boot class path in javac
- Example:
-
- <path id="java.class.path">
- <fileset dir="${classlib.luni.jardir}" includes="*.jar" />
- <fileset dir="${classlib.security.jardir}" includes="*.jar" />
- </path>
-
- - Java* unit tests file set description, which represents:
- - Java* unit tests source
- - Pattern for source file set
- Example:
-
- <path id="unit.test.javasrc">
- <pathelement location="${build.VM.home}/tests/unit" />
- </path>
- <patternset id="unit.test.java.pattern">
- <include name="**/*.java" />
- </patternset>
-
- - Java* smoke tests file set description, which represents:
- - Java* smoke tests source
- - Pattern for source file set
- - Pattern for classes file set
- Example:
-
- <property name="smoke.test.javasrc" location="${build.VM.home}/tests/smoke" />
- <patternset id="smoke.test.java.pattern">
- <include name="**/*.java"/>
- <exclude name="**/Logger.java"/>
- </patternset>
- <patternset id="smoke.test.pattern">
- <include name="**/*.class"/>
- <exclude name="**/*$*.class"/>
- </patternset>
-
-III. ATTRIBUTE-BASED FILTERING
-------------------------------
-
- To support the multiple platforms, operating systems, compilers and
- so on, the build supports an attribute-based filtering mechanism.
- Use the tags <select> to identify all elements (or sets of elements)
- in the descriptor file that can applied only to a specific operating system,
- platform architecture, debug or release mode or a native compiler.
- The following attributes are supported
- for <select> tags:
-
- Attr | Meaning | Supported values
- ------+--------------------+-----------------
- os | operating system | win, lnx
- arch | architecture | ia32, ipf, em64t
- cxx | native compiler | msvc, icl
- cfg | building mode | release, debug
-
- The example below illustrates using different source files
- for different operating systems and platform architectures.
-
- <compiler id="c.compiler" extends="comm.cpp.compiler">
- <fileset dir="${src}">
- <select os="win" arch="ia32">
- <compilerarg name="src/WINDOWS/IA-32/file.cpp" />
- </select>
- <select os="win" arch="ipf">
- <compilerarg name="src/WINDOWS/IPF/file.cpp" />
- </select>
- <select os="lnx" arch="ia32">
- <compilerarg name="src/LINUX/IA-32/file.cpp" />
- </select>
- <select os="win" arch="ia32,ipf">
- <compilerarg name="src/WINDOWS/IA-32_or_IPF/file2.cpp" />
- </select>
- ...
- </fileset>
- ...
- </compiler>
-
- Having no value for a specific attribute means that the contents of <select> tags
- is applicable for any value of the given attribute.
-
-
-IV. A COMPONENT DESCRIPTOR EXAMPLE
-----------------------------------
-
- This section provides the component descriptor sample that illustrates
- adding a new descriptor.
-
- <!-- All components descriptors are Ant projects with the name of
- the component name. -->
- <project name="vm.vmcore">
- <!-- The target "init" provides all static information that is required
- to build the component. The target can depend on common targets
- (see the common targets definition in the build/targets directory).
- Via targets, components can inherit common features. -->
-
- <!-- In the "init" target, you can include the following properties
- shared across components:
- $libname - the name of the library
- $src - the root of the source tree
- $includes - the include directory (if the components
- exports some include files)
- $libdir - the directory where the produced library
- is generated (if it deffered of the
- default one)
- $jarname - the name of produced jar file (if it
- exists)
- $jardir - the directory where the produced library
- is generated, all the property can be set
- in the common target and in the descriptor
- all the properties of the other components
- can be obtained for example
- ${classlib.luni.jarname} is the jarname of
- classlib.luni component
- -->
-
- <target name="init" depends="common_vm">
- <!-- ${target}.depends property defines the components that the
- component requires to execute the target. If the target
- does not depend on other componets, the property can
- be not set.
- For example, the component vm.mcore depends on
- extra.apr, extra.aprutil, extra.log4cxx, extra.zlib,
- vm.encoder, vm.port for building, but does not depend on
- them to run tests or to generate documents. -->
-
- <property name="build.depends" value="extra.apr,
- extra.aprutil,
- extra.log4cxx,
- extra.zlib,
- vm.encoder,
- vm.port" />
-
- <!-- the name and the type of the produced library:
- on Windows* vmcore.dll, on Linux* vmcore.so -->
- <property name="libname" value="vmcore" />
- <property name="outtype" value="shared" />
-
- <!-- the root of the source code location -->
- <property name="src" location="${build.vm.home}" />
-
- <!-- compiler settings to compile cpp sources, see
- cpptasks documentation -->
- <compiler id="cpp.compiler" extends="common.cpp.compiler">
- <fileset dir="${build.vm.home}/vmcore/src">
- <include name="class_support/*.cpp" />
- <include name="exception/*.cpp" />
- <include name="init/*.cpp" />
- <include name="gc/*.cpp" />
- <include name="interpreter/*.cpp" />
- <include name="jit/*.cpp" />
- <include name="jni/*.cpp" />
- <include name="jvmti/*.cpp" />
- <include name="object/*.cpp" />
- <include name="reflection/*.cpp" />
- <include name="stack/*.cpp" />
- <include name="thread/*.cpp" />
- <include name="util/*.cpp" />
- <include name="verifier/*.cpp" />
- </fileset>
- <!-- omitted some fileset from original
- vmcore.xml for obviousness -->
-
- <includepath>
- <pathelement location="${extra.apr.includes}" />
- <pathelement location="${extra.log4cxx.includes}" />
- <select os="win">
- <pathelement location="${extra.zlib.includes}" />
- </select>
- </includepath>
-
- <!-- omitted some includepath from original
- vmcore.xml; for obviousness -->
- <select os="win" cfg="release" cxx="icl">
- <compilerarg value="/Qip" />
- </select>
- <defineset define="BUILDING_VM,GC_V4,USE_DLL_JIT,APR_DECLARE_STATIC" />
- </compiler>
-
- <!-- assembler description section -->
- <select os="lnx" arch="ia32">
- <fileset id="asm.fileset"
- dir="${build.vm.home}/vmcore">
- <include name="src/util/ia32/base/*.asm" />
- </fileset>
- </select>
-
- <select os="lnx" arch="ipf">
- <fileset id="asm.fileset"
- dir="${build.vm.home}/vmcore">
- <include name="src/util/ipf/base/*.asm" />
- </fileset>
- </select>
-
- <!-- linker settings -->
- <linker id="linker" extends="common.linker">
- <libset libs="${vm.port.lib}"
- dir="${vm.port.libdir}" />
-
- <libset libs="${vm.encoder.lib}"
- dir="${vm.encoder.libdir}" />
-
- <libset libs="${extra.log4cxx.lib}"
- dir="${extra.log4cxx.libdir}" />
-
- <libset libs="${extra.aprutil.lib}"
- dir="${extra.aprutil.libdir}" />
-
- <libset libs="${extra.apr.lib}"
- dir="${extra.apr.libdir}" />
-
- <select os="win">
- <libset libs="${extra.zlib.lib}"
- dir="${extra.zlib.libdir}" />
- </select>
-
- <select os="win" cfg="debug">
- <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
- </select>
-
- <select os="lnx">
- <linkerarg value="--export-dynamic" />
- <linkerarg value="-lz" />
- <linkerarg value="-lxml2" />
- <linkerarg value="-lm" />
- <linkerarg value="-ldl" />
- <linkerarg value="-lpthread" />
- <linkerarg value="-lstdc++" />
- </select>
- </linker>
- </target>
- </project>
+
+
+ HOW TO ADD A NEW COMPONENT TO THE BUILD
+ =======================================
+
+I. INTRODUCTION
+---------------
+
+ The build provided with DRLVM has the following structure:
+
+ make/
+ |
+ +--- setup.xml
+ | first entry point: downloads, prepares and checks the necessary
+ | external resources
+ |
+ +--- get_antcontrib.xml
+ | used from setup.xml: gets ant-contrib from an external location
+ | and prepares it to be used by Ant
+ |
+ +--- build.xml
+ | second entry point: main build file
+ |
+ +--- deploy.xml
+ | describes the content of the product
+ |
+ +--- build_component.xml
+ | build 'core': generates and executes build file for
+ | each component
+ |
+ +--- build_component.xsl
+ | xslt used for pre-processing of component descriptors
+ |
+ +--- selector.xsl
+ | xslt used for attribute-based filtering of XML content
+ |
+ +--- ant/
+ | stub for the Ant Splash task that
+ | eliminates the dependency on Swing
+ |
+ +--- components/
+ | contains descriptors for components
+ |
+ +--- targets/
+ contains target templates and shared settings for
+ components
+
+ Each component in the product is described with an Ant-based XML descriptor.
+ To add a new component, you need to create a descriptor for it.
+ The component is defined as follows:
+
+ - A component is a more or less distinct part of product.
+
+ - A component can contain several types of source:
+ C++ sources, C sources, assembler sources, Java* sources, smoke
+ and unit tests.
+
+ - A component can be processed in several ways in the build:
+ produce native output (shared or static library or executable)
+ and/or Java* classes in .jar file, produce and run smoke and/or unit tests.
+
+ The build dynamically produces a build_${component}.xml file for
+ each specific component by taking its descriptor, performing the
+ attribute-based filtering on it, and then applying target templates
+ and settings on it.
+
+
+II. HOW TO DEVELOP A COMPONENT DESCRIPTOR
+-----------------------------------------
+
+ Each descriptor is placed in the components/ directory and
+ follows the structure described below:
+
+ 1. Component build descriptor must be formed in the project with
+ the corresponding name and nested target with a fixed name.
+ Example with the name init:
+
+ <project name="component_name" >
+ <target name="init">
+ ...
+ </target>
+ </project>
+
+ 2. Inside the mentioned project and target tags, the
+ descriptor must follow the following structure:
+
+ - Native part:
+ - Common description:
+ - The property "libname" represents the native output
+ (shared/static library or executable) file name,
+ specified without the extention, for example,
+
+ <property name="libname" value="lang" />
+
+ - The property "outtype" represents the native output type
+ ("shared", "static" or "executable").
+ Example:
+ <property name="outtype" value="shared" />
+
+ - C compilation related description:
+ The compiler definition with id="c.compiler" represents
+ the C-related resources: the source path file set, the directory
+ set of include files, compiler arguments, and define
+ sets. Example:
+
+ <compiler id="c.compiler" extends="comm.cpp.compiler">
+ <includepath>
+ <dirset dir="${src}" >
+ <include name="src\api" />
+ </dirset>
+ </includepath>
+ <fileset dir="${src}">
+ <include name="src/vm/*.c" />
+ </fileset>
+ <compilerarg value="/WX" />
+ <defineset define="DEBUG" />
+ </compiler>
+
+ - C++ compilation related description:
+ The compiler definition with id="cpp.compiler" represents
+ the C++-related resources: the source path file set, the directory
+ set of include files, compiler arguments, and define
+ sets. Example:
+
+ <compiler id="cpp.compiler" extends="common.cpp.compiler">
+ <includepath>
+ <dirset dir="${src}" >
+ <include name="src/api" />
+ </dirset>
+ </includepath>
+ <fileset dir="${src}">
+ <include name="src/vm/*.cpp" />
+ </fileset>
+ <compilerarg value="/WX" />
+ <defineset define="DEBUG" />
+ </compiler>
+
+ - Assembler compilation description:
+ The description represents the assembler source file set
+ and compiler arguments. Example:
+
+ <fileset id="asm.fileset" dir="${src}">
+ <include name="vmcore/src/thread/atomic.asm" />
+ </fileset>
+ <property name="asm.args" value="-Wa" />
+
+ - Linker-related description:
+ The description represents the library set and linker arguments.
+ NOTE: You need not include object files produced in the native part;
+ they will be passed to the linker automatically.
+ Example:
+
+ <linker id="linker" extends="common.linker">
+ <linkerarg value="--export-dynamic" />
+ <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
+ <syslibset libs="advapi32,userenv,ws2_32,vmcore,odbc32,mswsock" />
+ <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
+ </linker>
+
+ - Java* part:
+ - The property "jarname" represents the output .jar file name
+ with compiled Java* classes with no file extention specified.
+ Example:
+
+ <property name="jarname" value="kernel.jar" />
+
+ - Java* source file set description.
+ Example:
+
+ <path id="java.source">
+ <pathelement location="${build.vm.home}/vmcore/src/kernel_classes/javasrc" />
+ </path>
+
+ - Java* source files pattern: files to pass to javac
+ Example:
+
+ <patternset id="java.source.pattern" includes="**/*.java"/>
+
+ - Java* class files pattern: files to pack into the .jar file
+ Example:
+
+ <patternset id="java.classes.pattern" includes="**/*.class"/>
+
+ - Java* class path used as the boot class path in javac
+ Example:
+
+ <path id="java.class.path">
+ <fileset dir="${classlib.luni.jardir}" includes="*.jar" />
+ <fileset dir="${classlib.security.jardir}" includes="*.jar" />
+ </path>
+
+ - Java* unit tests file set description, which represents:
+ - Java* unit tests source
+ - Pattern for source file set
+ Example:
+
+ <path id="unit.test.javasrc">
+ <pathelement location="${build.VM.home}/tests/unit" />
+ </path>
+ <patternset id="unit.test.java.pattern">
+ <include name="**/*.java" />
+ </patternset>
+
+ - Java* smoke tests file set description, which represents:
+ - Java* smoke tests source
+ - Pattern for source file set
+ - Pattern for classes file set
+ Example:
+
+ <property name="smoke.test.javasrc" location="${build.VM.home}/tests/smoke" />
+ <patternset id="smoke.test.java.pattern">
+ <include name="**/*.java"/>
+ <exclude name="**/Logger.java"/>
+ </patternset>
+ <patternset id="smoke.test.pattern">
+ <include name="**/*.class"/>
+ <exclude name="**/*$*.class"/>
+ </patternset>
+
+III. ATTRIBUTE-BASED FILTERING
+------------------------------
+
+ To support the multiple platforms, operating systems, compilers and
+ so on, the build supports an attribute-based filtering mechanism.
+ Use the tags <select> to identify all elements (or sets of elements)
+ in the descriptor file that can applied only to a specific operating system,
+ platform architecture, debug or release mode or a native compiler.
+ The following attributes are supported
+ for <select> tags:
+
+ Attr | Meaning | Supported values
+ ------+--------------------+-----------------
+ os | operating system | win, lnx
+ arch | architecture | ia32, ipf, em64t
+ cxx | native compiler | msvc, icl
+ cfg | building mode | release, debug
+
+ The example below illustrates using different source files
+ for different operating systems and platform architectures.
+
+ <compiler id="c.compiler" extends="comm.cpp.compiler">
+ <fileset dir="${src}">
+ <select os="win" arch="ia32">
+ <compilerarg name="src/WINDOWS/IA-32/file.cpp" />
+ </select>
+ <select os="win" arch="ipf">
+ <compilerarg name="src/WINDOWS/IPF/file.cpp" />
+ </select>
+ <select os="lnx" arch="ia32">
+ <compilerarg name="src/LINUX/IA-32/file.cpp" />
+ </select>
+ <select os="win" arch="ia32,ipf">
+ <compilerarg name="src/WINDOWS/IA-32_or_IPF/file2.cpp" />
+ </select>
+ ...
+ </fileset>
+ ...
+ </compiler>
+
+ Having no value for a specific attribute means that the contents of <select> tags
+ is applicable for any value of the given attribute.
+
+
+IV. A COMPONENT DESCRIPTOR EXAMPLE
+----------------------------------
+
+ This section provides the component descriptor sample that illustrates
+ adding a new descriptor.
+
+ <!-- All components descriptors are Ant projects with the name of
+ the component name. -->
+ <project name="vm.vmcore">
+ <!-- The target "init" provides all static information that is required
+ to build the component. The target can depend on common targets
+ (see the common targets definition in the build/targets directory).
+ Via targets, components can inherit common features. -->
+
+ <!-- In the "init" target, you can include the following properties
+ shared across components:
+ $libname - the name of the library
+ $src - the root of the source tree
+ $includes - the include directory (if the components
+ exports some include files)
+ $libdir - the directory where the produced library
+ is generated (if it deffered of the
+ default one)
+ $jarname - the name of produced jar file (if it
+ exists)
+ $jardir - the directory where the produced library
+ is generated, all the property can be set
+ in the common target and in the descriptor
+ all the properties of the other components
+ can be obtained for example
+ ${classlib.luni.jarname} is the jarname of
+ classlib.luni component
+ -->
+
+ <target name="init" depends="common_vm">
+ <!-- ${target}.depends property defines the components that the
+ component requires to execute the target. If the target
+ does not depend on other componets, the property can
+ be not set.
+ For example, the component vm.mcore depends on
+ extra.apr, extra.aprutil, extra.log4cxx, extra.zlib,
+ vm.encoder, vm.port for building, but does not depend on
+ them to run tests or to generate documents. -->
+
+ <property name="build.depends" value="extra.apr,
+ extra.aprutil,
+ extra.log4cxx,
+ extra.zlib,
+ vm.encoder,
+ vm.port" />
+
+ <!-- the name and the type of the produced library:
+ on Windows* vmcore.dll, on Linux* vmcore.so -->
+ <property name="libname" value="vmcore" />
+ <property name="outtype" value="shared" />
+
+ <!-- the root of the source code location -->
+ <property name="src" location="${build.vm.home}" />
+
+ <!-- compiler settings to compile cpp sources, see
+ cpptasks documentation -->
+ <compiler id="cpp.compiler" extends="common.cpp.compiler">
+ <fileset dir="${build.vm.home}/vmcore/src">
+ <include name="class_support/*.cpp" />
+ <include name="exception/*.cpp" />
+ <include name="init/*.cpp" />
+ <include name="gc/*.cpp" />
+ <include name="interpreter/*.cpp" />
+ <include name="jit/*.cpp" />
+ <include name="jni/*.cpp" />
+ <include name="jvmti/*.cpp" />
+ <include name="object/*.cpp" />
+ <include name="reflection/*.cpp" />
+ <include name="stack/*.cpp" />
+ <include name="thread/*.cpp" />
+ <include name="util/*.cpp" />
+ <include name="verifier/*.cpp" />
+ </fileset>
+ <!-- omitted some fileset from original
+ vmcore.xml for obviousness -->
+
+ <includepath>
+ <pathelement location="${extra.apr.includes}" />
+ <pathelement location="${extra.log4cxx.includes}" />
+ <select os="win">
+ <pathelement location="${extra.zlib.includes}" />
+ </select>
+ </includepath>
+
+ <!-- omitted some includepath from original
+ vmcore.xml; for obviousness -->
+ <select os="win" cfg="release" cxx="icl">
+ <compilerarg value="/Qip" />
+ </select>
+ <defineset define="BUILDING_VM,GC_V4,USE_DLL_JIT,APR_DECLARE_STATIC" />
+ </compiler>
+
+ <!-- assembler description section -->
+ <select os="lnx" arch="ia32">
+ <fileset id="asm.fileset"
+ dir="${build.vm.home}/vmcore">
+ <include name="src/util/ia32/base/*.asm" />
+ </fileset>
+ </select>
+
+ <select os="lnx" arch="ipf">
+ <fileset id="asm.fileset"
+ dir="${build.vm.home}/vmcore">
+ <include name="src/util/ipf/base/*.asm" />
+ </fileset>
+ </select>
+
+ <!-- linker settings -->
+ <linker id="linker" extends="common.linker">
+ <libset libs="${vm.port.lib}"
+ dir="${vm.port.libdir}" />
+
+ <libset libs="${vm.encoder.lib}"
+ dir="${vm.encoder.libdir}" />
+
+ <libset libs="${extra.log4cxx.lib}"
+ dir="${extra.log4cxx.libdir}" />
+
+ <libset libs="${extra.aprutil.lib}"
+ dir="${extra.aprutil.libdir}" />
+
+ <libset libs="${extra.apr.lib}"
+ dir="${extra.apr.libdir}" />
+
+ <select os="win">
+ <libset libs="${extra.zlib.lib}"
+ dir="${extra.zlib.libdir}" />
+ </select>
+
+ <select os="win" cfg="debug">
+ <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
+ </select>
+
+ <select os="lnx">
+ <linkerarg value="--export-dynamic" />
+ <linkerarg value="-lz" />
+ <linkerarg value="-lxml2" />
+ <linkerarg value="-lm" />
+ <linkerarg value="-ldl" />
+ <linkerarg value="-lpthread" />
+ <linkerarg value="-lstdc++" />
+ </select>
+ </linker>
+ </target>
+ </project>
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apriconv.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/eclipse_script.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hyplugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/jre_libraries.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/kernel_classes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmstart.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/get_antcontrib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/selector.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties?rev=432103&r1=432102&r2=432103&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties Wed Aug 16 18:53:11 2006
@@ -1,93 +1,93 @@
-# Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# @author: Marina V. Goldburt
-# @version: $Revision: 1.6.2.27 $
-
-# This file contains the definitions for external resources being used by the build.
-# Resources are downloaded to the local drive during the first launch of the build.
-# Each network resource location is configured as follows:
-#
-# remote.<resource name>.archive=<Resource URL>
-#
-# Which can be overridden through the system environment as follows:
-#
-# <resource name>_HOME=<extracted archive location>
-#
-# For example, the build takes Eclipse from it's default location on Windows:
-#
-#remote.ECLIPSE.archive=http://mirrors.cat.pdx.edu/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-JDT-3.1.1.zip
-#
-# unless the ECLIPSE_HOME is set and points to the Eclipse installation directory.
-
-# Eclipse SDK, version 3.1.1 EXACTLY
-# http://download.eclipse.org/eclipse/downloads/
-#remote.ECLIPSE.archive=http://eclipse.objectweb.org/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
-remote.ECLIPSE.archive=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
-
-# Cpptasks, version 1.0 beta 3 or above
-# http://sourceforge.net/project/showfiles.php?group_id=36177
-remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
-
-# Ant-contrib, version 0.6 or above
-# http://sourceforge.net/project/showfiles.php?group_id=36177
-remote.ANTCONTRIB.archive=http://belnet.dl.sourceforge.net/sourceforge/ant-contrib/ant-contrib-1.0b2-bin.zip
-
-# ZLIB, version 1.2.1 or above
-# http://www.zlib.net/
-remote.ZLIB.archive=http://www.zlib.net/zlib123-dll.zip
-
-# Harmony class libraries (sources & pre-built binaries)
-# https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
-# remote.CLASSLIB.archive=-r 385366 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
-# remote.CLASSLIB.archive= https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
-# remote.CLASSLIB.archive.type=svn
-
-CLASSLIB_HOME=../../../classlib/trunk/
-
-# Apache Portable Runtime, version 1.1 or above
-# http://apr.apache.org/download.cgi
-remote.APR.archive=http://www.reverse.net/pub/apache/apr/apr-1.2.6.zip
-
-# APR-util, version 1.2.2 or above
-# http://apr.apache.org/download.cgi
-remote.APRUTIL.archive=http://www.reverse.net/pub/apache/apr/apr-util-1.2.6.zip
-
-# APR-iconv, version 1.1.1 or above
-# http://apr.apache.org/download.cgi
-remote.APRICONV.archive=http://apache.reverse.net/pub/apache/apr/apr-iconv-1.1.1-win32-src.zip
-
-# LOG4CXX, svn revision 416779
-remote.LOG4CXX.archive=-r 416779 https://svn.apache.org/repos/asf/logging/log4cxx/trunk
-remote.LOG4CXX.archive.type=svn
-
-# IJ Eclipse plugin
-remote.HYPLUGIN.archive=-r 387505 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching
-remote.HYPLUGIN.archive.type=svn
-
-# Xalan-Java version 2.7.0
-XALAN_HOME=${external.dep.CLASSLIB}/depends/jars/xalan-j_2.7.0
-
-VM_HOME=..\..\vm
-PATCHES_HOME=../patches
-
-#proxy configuration
-# http.proxyHost=
-# http.proxyPort=
-
-# Default building mode, either release or debug
-BUILD_CFG=debug
-
-# Default C compiler, either icl or msvc
-CXX=msvc
+# Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# @author: Marina V. Goldburt
+# @version: $Revision: 1.6.2.27 $
+
+# This file contains the definitions for external resources being used by the build.
+# Resources are downloaded to the local drive during the first launch of the build.
+# Each network resource location is configured as follows:
+#
+# remote.<resource name>.archive=<Resource URL>
+#
+# Which can be overridden through the system environment as follows:
+#
+# <resource name>_HOME=<extracted archive location>
+#
+# For example, the build takes Eclipse from it's default location on Windows:
+#
+#remote.ECLIPSE.archive=http://mirrors.cat.pdx.edu/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-JDT-3.1.1.zip
+#
+# unless the ECLIPSE_HOME is set and points to the Eclipse installation directory.
+
+# Eclipse SDK, version 3.1.1 EXACTLY
+# http://download.eclipse.org/eclipse/downloads/
+#remote.ECLIPSE.archive=http://eclipse.objectweb.org/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
+remote.ECLIPSE.archive=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
+
+# Cpptasks, version 1.0 beta 3 or above
+# http://sourceforge.net/project/showfiles.php?group_id=36177
+remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
+
+# Ant-contrib, version 0.6 or above
+# http://sourceforge.net/project/showfiles.php?group_id=36177
+remote.ANTCONTRIB.archive=http://belnet.dl.sourceforge.net/sourceforge/ant-contrib/ant-contrib-1.0b2-bin.zip
+
+# ZLIB, version 1.2.1 or above
+# http://www.zlib.net/
+remote.ZLIB.archive=http://www.zlib.net/zlib123-dll.zip
+
+# Harmony class libraries (sources & pre-built binaries)
+# https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
+# remote.CLASSLIB.archive=-r 385366 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
+# remote.CLASSLIB.archive= https://svn.apache.org/repos/asf/incubator/harmony/enhanced/classlib/trunk
+# remote.CLASSLIB.archive.type=svn
+
+CLASSLIB_HOME=../../../classlib/trunk/
+
+# Apache Portable Runtime, version 1.1 or above
+# http://apr.apache.org/download.cgi
+remote.APR.archive=http://www.reverse.net/pub/apache/apr/apr-1.2.6.zip
+
+# APR-util, version 1.2.2 or above
+# http://apr.apache.org/download.cgi
+remote.APRUTIL.archive=http://www.reverse.net/pub/apache/apr/apr-util-1.2.6.zip
+
+# APR-iconv, version 1.1.1 or above
+# http://apr.apache.org/download.cgi
+remote.APRICONV.archive=http://apache.reverse.net/pub/apache/apr/apr-iconv-1.1.1-win32-src.zip
+
+# LOG4CXX, svn revision 416779
+remote.LOG4CXX.archive=-r 416779 https://svn.apache.org/repos/asf/logging/log4cxx/trunk
+remote.LOG4CXX.archive.type=svn
+
+# IJ Eclipse plugin
+remote.HYPLUGIN.archive=-r 387505 https://svn.apache.org/repos/asf/incubator/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.jdt.launching
+remote.HYPLUGIN.archive.type=svn
+
+# Xalan-Java version 2.7.0
+XALAN_HOME=${external.dep.CLASSLIB}/depends/jars/xalan-j_2.7.0
+
+VM_HOME=..\..\vm
+PATCHES_HOME=../patches
+
+#proxy configuration
+# http.proxyHost=
+# http.proxyPort=
+
+# Default building mode, either release or debug
+BUILD_CFG=debug
+
+# Default C compiler, either icl or msvc
+CXX=msvc
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt?rev=432103&r1=432102&r2=432103&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt Wed Aug 16 18:53:11 2006
@@ -1,45 +1,45 @@
-UPDATE TO HARMONY SOURCES FOR INTEL DRLVM CONTRIBUTION
- March 30, 2006
-======================================
-
-This archive contains patches for the Apache Harmony class libraries:
- - Small patch for the class library com.ibm.oti.vm.MsgHelp
- The setLocale() method has been accommodated to work with the null class loader.
- - Patch for java/net/URLClassLoader.java to correctly process whitespaces
- in classpath.
- - Patch for the org.apache.harmony.eclipse.jdt.launching plugin
- The new functionality enables Eclipse* to recognize Intel DRLVM.
-
-Extract the archive in the same directory as Intel DRLVM.
-
-1. ARCHIVE CONTENTS
--------------------
-
-After extracting the archive, the following directories appear under
-<DRLVM_EXTRACT_DIR>/Harmony, where <DRLVM_EXTRACT_DIR> is the location,
-to which you have extracted DRLVM and this archive:
-
-<DRLVM_EXTRACT_DIR>/Harmony/build/patches
- |
- +---common
- | |
- | +- CLASSLIB... - patched class library sources
- | |
- | +- HYPLUGIN... - patched Eclipse* plugin sources
- |
- +- README - This file
- |
- +- hyplugin.patch
- |
- +- luni-msghelp.patch
- |
- +- url_classloader.patch
-
-2. PATCHING HARMONY CLASSES
----------------------------
-
-The DRLVM build patches Harmony sources automatically as the last step
-of the external resource downloading. See the README.txt file for the VM
-for more information about DRLVM building process.
-
-*) Other brands and names are the property of their respective owners.
+UPDATE TO HARMONY SOURCES FOR INTEL DRLVM CONTRIBUTION
+ March 30, 2006
+======================================
+
+This archive contains patches for the Apache Harmony class libraries:
+ - Small patch for the class library com.ibm.oti.vm.MsgHelp
+ The setLocale() method has been accommodated to work with the null class loader.
+ - Patch for java/net/URLClassLoader.java to correctly process whitespaces
+ in classpath.
+ - Patch for the org.apache.harmony.eclipse.jdt.launching plugin
+ The new functionality enables Eclipse* to recognize Intel DRLVM.
+
+Extract the archive in the same directory as Intel DRLVM.
+
+1. ARCHIVE CONTENTS
+-------------------
+
+After extracting the archive, the following directories appear under
+<DRLVM_EXTRACT_DIR>/Harmony, where <DRLVM_EXTRACT_DIR> is the location,
+to which you have extracted DRLVM and this archive:
+
+<DRLVM_EXTRACT_DIR>/Harmony/build/patches
+ |
+ +---common
+ | |
+ | +- CLASSLIB... - patched class library sources
+ | |
+ | +- HYPLUGIN... - patched Eclipse* plugin sources
+ |
+ +- README - This file
+ |
+ +- hyplugin.patch
+ |
+ +- luni-msghelp.patch
+ |
+ +- url_classloader.patch
+
+2. PATCHING HARMONY CLASSES
+---------------------------
+
+The DRLVM build patches Harmony sources automatically as the last step
+of the external resource downloading. See the README.txt file for the VM
+for more information about DRLVM building process.
+
+*) Other brands and names are the property of their respective owners.
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/patches/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/patches/common/HYPLUGIN/src/org/apache/harmony/eclipse/jdt/launching/HyVMRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/drlvm/trunk/build/patches/hyplugin.patch
------------------------------------------------------------------------------
svn:eol-style = native