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
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk@781482 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 4169286..f623f2f 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
diff --git a/make/build-java.xml b/make/build-java.xml
index 1934209..0257adb 100644
--- a/make/build-java.xml
+++ b/make/build-java.xml
@@ -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>
diff --git a/make/resources/readme.txt b/make/resources/readme.txt
index 9ff15ef..c4be25a 100644
--- a/make/resources/readme.txt
+++ b/make/resources/readme.txt
@@ -1,31 +1,55 @@
-
- Apache Harmony JRE with DRLVM
- Binary Release for windows*/x86
+Apache Harmony - Open Source Java SE
+http://harmony.apache.org/
+Binary Release for @{hy.os}/@{hy.arch} with DRLVM
-CONTENTS
----------
+Apache Harmony is the Java SE project of the Apache Software Foundation.
-The JRE contains the following directories
+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.
+
+For more information about using Apache Harmony see:
+
+ http://harmony.apache.org/quickhelp_users.html
+
+Please send any feedback to:
+
+ dev@harmony.apache.org
- 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
+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.
-SYSTEM REQUIREMENTS
--------------------
+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.
-This distribution was build for the x86 architecture and
-the windows operating system.
+The following provides more details on the included cryptographic
+software:
-
-JIT EXECUTION MODE
-------------------
-
-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.
+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).
