harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r781482 - in /harmony/enhanced: classlib/trunk/make/build-test.xml drlvm/trunk/build.xml drlvm/trunk/make/build-java.xml drlvm/trunk/make/resources/readme.txt trunk/README trunk/build.xml
Date Wed, 03 Jun 2009 17:16:27 GMT
Author: hindessm
Date: Wed Jun  3 17:16:27 2009
New Revision: 781482

URL: http://svn.apache.org/viewvc?rev=781482&view=rev
Log:
Fixing various license and readme issues.  I think this fixes:

  [#HARMONY-6193] Crypto notice missing from README file(s) and

  [#HARMONY-6155] NOTICE file does not have required contents

More info on the changes can be found at:

  http://markmail.org/thread/7vyphok725v3duoh
 

Added:
    harmony/enhanced/trunk/README   (with props)
Modified:
    harmony/enhanced/classlib/trunk/make/build-test.xml
    harmony/enhanced/drlvm/trunk/build.xml
    harmony/enhanced/drlvm/trunk/make/build-java.xml
    harmony/enhanced/drlvm/trunk/make/resources/readme.txt
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=781482&r1=781481&r2=781482&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Wed Jun  3 17:16:27 2009
@@ -21,14 +21,15 @@
 
     <description> Tests for classlib package</description>
 
+    <property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
     <!-- set global properties for this build. -->
 
     <property name="tests.output" location="build/test_report" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <property name="tests.build.output" location="build/tests" />
     <property name="tests.support.output" location="build/test_support" />
@@ -96,6 +97,7 @@
         <jar destfile="${hy.hdk}/build/test/support.jar"
              manifest="support/META-INF/MANIFEST.MF">
             <fileset dir="${tests.support.output}" />
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
         <copy todir="${hy.hdk}/build/test"> 
         <fileset dir="${jetty.dir}">

Modified: harmony/enhanced/drlvm/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build.xml?rev=781482&r1=781481&r2=781482&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build.xml Wed Jun  3 17:16:27 2009
@@ -223,12 +223,12 @@
             todir="${drlvm.bin.dir}"/>
 
         <copy file="${drlvm.base.dir}/make/resources/readme.txt" 
-            todir="${drlvm.deploy.dir}/jdk/jre"/>
-        <replace file="${drlvm.base.dir}/make/resources/readme.txt">
+              tofile="${drlvm.deploy.dir}/jdk/jre/README"/>
+        <replace file="${drlvm.deploy.dir}/jdk/jre/README" >
             <replacefilter token="@{hy.os}" value="${hy.os}"/>
             <replacefilter token="@{hy.arch}" value="${hy.arch}"/>
         </replace>
-        <fixcrlf srcDir="${drlvm.deploy.dir}/jdk/jre/" includes="readme.txt" />
+        <fixcrlf srcDir="${drlvm.deploy.dir}/jdk/jre" includes="README" />
         
         <chmod file="${drlvm.deploy.dir}/jdk/jre/bin/java*" perm="ugo+x" />
     </target>

Modified: harmony/enhanced/drlvm/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/build-java.xml?rev=781482&r1=781481&r2=781482&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/build-java.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/build-java.xml Wed Jun  3 17:16:27 2009
@@ -19,6 +19,12 @@
 
     <dirname property="bj.imported.basedir" file="${ant.file.build-java}"/>
     <import file="${bj.imported.basedir}/properties.xml"/>
+
+    <!-- During packaging, these files must be copied into the meta-inf dir -->
+    <fileset id="hy.required.metainf-files" dir="${hy.hdk}">
+        <include name="NOTICE" />
+        <include name="LICENSE" />
+    </fileset>
     
     <macrodef name="compile-java">
         <attribute name="src"/>
@@ -46,9 +52,11 @@
             <mkdir dir="${drlvm.bin.dir}"/>
             <jar jarfile="${drlvm.bin.dir}/@{component}.jar" manifest="@{manifest}">
                 <fileset dir="${drlvm.semi.dir}/@{component}/classes"/>
+                <metainf refid="hy.required.metainf-files"/>
             </jar>
             <jar jarfile="${drlvm.bin.dir}/@{component}-src.jar" manifest="@{manifest}">
                 <fileset dir="@{src}" includes="**/*.java"/>
+                <metainf refid="hy.required.metainf-files"/>
             </jar>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/drlvm/trunk/make/resources/readme.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/resources/readme.txt?rev=781482&r1=781481&r2=781482&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/resources/readme.txt (original)
+++ harmony/enhanced/drlvm/trunk/make/resources/readme.txt Wed Jun  3 17:16:27 2009
@@ -1,31 +1,55 @@
+Apache Harmony - Open Source Java SE
+http://harmony.apache.org/
+Binary Release for @{hy.os}/@{hy.arch} with DRLVM
 
-    Apache Harmony JRE with DRLVM
-    Binary Release for windows*/x86
 
+Apache Harmony is the Java SE project of the Apache Software Foundation.
 
-CONTENTS
----------
+The aim of the project is to produce a large and healthy community of
+those interested in runtime platforms tasked with creation of:
 
-The JRE contains the following directories
+ * A compatible, independent implementation of the Java SE JDK under
+   the Apache License v2
 
+ * A community-developed modular runtime (VM and class library)
+   architecture.
 
-  bin         - Main DRL executable file and set of dynamic libraries
-                needed for running
-  doc         - Getting Started guide
-  include     - Set of header files containing an external specification
-  lib         - Compiled classes and other resources
+For more information about using Apache Harmony see:
 
+  http://harmony.apache.org/quickhelp_users.html
 
-SYSTEM REQUIREMENTS
--------------------
+Please send any feedback to:
 
-This distribution was build for  the x86 architecture and
-the windows operating system.
+  dev@harmony.apache.org
 
 
-JIT EXECUTION MODE
-------------------
+Export Notice
+-------------
 
-By default, the VM runs with the just-in-time compiler enabled.
-To start the VM with the interpreter, supply the -Xint command-line option
-right after the executable name.
+This distribution includes cryptographic software.  The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software.  BEFORE using any encryption software, please
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to
+see if this is permitted.  See http://www.wassenaar.org/ for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms.  The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+
+Apache Harmony contains code that is specifically designed to enable
+cryptography.  In particular Apache Harmony contains an implementation
+the Java cryptographic extensions.  In addition, binary distributions
+of Apache Harmony may contain cryptographic functionality provided by
+The Legion of the Bouncy Castle (http://www.bouncycastle.org).

Added: harmony/enhanced/trunk/README
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/README?rev=781482&view=auto
==============================================================================
--- harmony/enhanced/trunk/README (added)
+++ harmony/enhanced/trunk/README Wed Jun  3 17:16:27 2009
@@ -0,0 +1,65 @@
+Apache Harmony - Open Source Java SE
+http://harmony.apache.org/
+
+Apache Harmony is the Java SE project of the Apache Software Foundation.
+
+The aim of the project is to produce a large and healthy community of
+those interested in runtime platforms tasked with creation of:
+
+ * A compatible, independent implementation of the Java SE JDK under
+   the Apache License v2
+
+ * A community-developed modular runtime (VM and class library)
+   architecture.
+
+This source can be built from a tar/zip using:
+
+  ant fetch-depends build
+
+To build from a subversion checkout it is necessary to fetch the
+component source with:
+
+  ant populate-src
+
+For information, including details of the prerequisites, see:
+
+  http://harmony.apache.org/quickhelp_contributors.html
+
+For more information about using Apache Harmony see:
+
+  http://harmony.apache.org/quickhelp_users.html
+
+Please send any feedback to:
+
+  dev@harmony.apache.org
+
+Export Notice
+-------------
+
+This distribution includes cryptographic software.  The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software.  BEFORE using any encryption software, please
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to
+see if this is permitted.  See http://www.wassenaar.org/ for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms.  The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+
+Apache Harmony contains code that is specifically designed to enable
+cryptography.  In particular Apache Harmony contains an implementation
+the Java cryptographic extensions.  In addition, binary distributions
+of Apache Harmony may contain cryptographic functionality provided by
+The Legion of the Bouncy Castle (http://www.bouncycastle.org).

Propchange: harmony/enhanced/trunk/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=781482&r1=781481&r2=781482&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed Jun  3 17:16:27 2009
@@ -156,6 +156,11 @@
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java"/>
                 <exclude name="jdk/bin/*"/>
+                <exclude name="jdk/jre/README"/>
+            </tarfileset>
+            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+                        prefix="harmony-hdk-${harmony.version}">
+                <include name="README"/>
             </tarfileset>
         </tar>
 
@@ -178,6 +183,11 @@
                 <exclude name="jdk/jre/bin/java.exe"/>
                 <exclude name="jdk/jre/bin/javaw.exe"/>
                 <exclude name="jdk/bin/*"/>
+                <exclude name="jdk/jre/README"/>
+            </zipfileset>
+            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+                        prefix="harmony-hdk-${harmony.version}">
+                <include name="README"/>
             </zipfileset>
         </zip>
 
@@ -204,6 +214,11 @@
                 <include name="**"/>
                 <exclude name="jre/bin/java"/>
                 <exclude name="bin/*"/>
+                <exclude name="jre/README"/>
+            </tarfileset>
+            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+                        prefix="harmony-jdk-${harmony.version}">
+                <include name="README"/>
             </tarfileset>
         </tar>
 
@@ -224,6 +239,11 @@
                 <exclude name="jre/bin/java.exe"/>
                 <exclude name="jre/bin/javaw.exe"/>
                 <exclude name="bin/*"/>
+                <exclude name="jre/README"/>
+            </zipfileset>
+            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+                        prefix="harmony-jdk-${harmony.version}">
+                <include name="README"/>
             </zipfileset>
         </zip>
         <chksum dir="${target.dir}" file="${deploy.jdk.zip}" />
@@ -350,7 +370,7 @@
     <!-- ============================================================== -->
     <target name="assemble-hdk-doc">
 
-        <copy todir="${target.dir}/hdk">
+        <copy todir="${target.dir}/hdk" overwrite="true">
             <fileset dir="./">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -364,7 +384,7 @@
     <!-- ============================================================== -->
     <target name="assemble-jre-doc">
 
-        <copy todir="${target.dir}/hdk/jdk/jre">
+        <copy todir="${target.dir}/hdk/jdk/jre" overwrite="true">
             <fileset dir="./">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -373,7 +393,7 @@
     </target>
 
     <target name="assemble-jdk-doc">
-        <copy todir="${target.dir}/hdk/jdk/">
+        <copy todir="${target.dir}/hdk/jdk/" overwrite="true">
             <fileset dir="./">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -398,6 +418,15 @@
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
         </ant>
+        <!-- hack to make sure the vm doesn't use the classlib
+             LICENSE/NOTICE files as they don't cover ICU4C
+          -->
+        <copy todir="working_classlib/deploy" overwrite="true">
+            <fileset dir=".">
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+        </copy>                                                             
     </target>
 
     <target name="auto-fetch-classlib-libs" if="auto.fetch">



Mime
View raw message