changeset 46:eec0548a4c84

indy, meth: update project structure
author jrose
date Fri, 24 Sep 2010 16:10:11 -0700
parents 587e815d5aa9
children 4436cde7337c
files netbeans/indy-demo/build.xml netbeans/indy-demo/nbproject/project.properties netbeans/meth/build.xml netbeans/meth/nbproject/project.properties
diffstat 4 files changed, 49 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/netbeans/indy-demo/build.xml	Fri Sep 24 16:09:59 2010 -0700
+++ b/netbeans/indy-demo/build.xml	Fri Sep 24 16:10:11 2010 -0700
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="indy-demo" default="default" basedir=".">
     <description>Builds, tests, and runs the project indy-demo.</description>
+
+    <!-- see end of nbproject/project.properties for properties that might need patching here: -->
+    <property name="user.properties.file" value="build.properties"/>
+
     <import file="nbproject/build-impl.xml"/>
 
     <target name="-pre-compile">
--- a/netbeans/indy-demo/nbproject/project.properties	Fri Sep 24 16:09:59 2010 -0700
+++ b/netbeans/indy-demo/nbproject/project.properties	Fri Sep 24 16:10:11 2010 -0700
@@ -26,10 +26,16 @@
 javac.classpath=\
     ${reference.meth.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=-XDinvokedynamic -Xlint:deprecation
+javac.compilerargs=-XDinvokedynamic -Xlint:none -XDallowTransitionalJSR292=${allowTransitionalJSR292} ${javac.standalone.bcp}
+# choices: yes, no, only
+allowTransitionalJSR292=only
+# assuming full JDK_7X:
+#javac.standalone.bcp =
+# pulling from a standalone langtools build:
+javac.standalone.bcp = -J-Xbootclasspath/p:${reference.langtools-javac.jar}
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.source=1.7
+javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -51,11 +57,10 @@
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 platform.active=JDK_7X
-#file.reference.projects=${user.home}/Projects
-file.reference.projects=${project.davinci}/patches/netbeans
-project.meth=${file.reference.projects}/meth
-reference.meth.jar=${project.meth}/dist/meth.jar
-reference.langtools=${project.davinci}/sources/langtools
+file.reference.meth=${file.reference.davinci}/patches/netbeans/meth
+reference.meth.jar=${file.reference.meth}/dist/meth.jar
+file.reference.davinci.sources.langtools=${file.reference.davinci}/sources/langtools
+reference.langtools-javac.jar=${file.reference.davinci.sources.langtools}/dist/lib/javac.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -64,7 +69,7 @@
 # or test-sys-prop.name=value to set system properties for unit tests):
 run.jvmargs=-ea -esa -XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic ${config.run.jvmargs} -Xbootclasspath/p:"${run.classpath}:${libs.junit_4.classpath}"
 #manual hack: override ${config.run.jvmargs} in ${config}.properties
-config.run.jvmargs=
+config.run.jvmargs=-XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
@@ -75,7 +80,11 @@
 # these should be globally defined in most setups, but are given here locally for completeness:
 platforms.JDK_7X.bootclasspath=${platforms.JDK_7X.home}/jre/lib/resources.jar:${platforms.JDK_7X.home}/jre/lib/rt.jar:${platforms.JDK_7X.home}/jre/lib/sunrsasign.jar:${platforms.JDK_7X.home}/jre/lib/jsse.jar:${platforms.JDK_7X.home}/jre/lib/jce.jar:${platforms.JDK_7X.home}/jre/lib/charsets.jar:${platforms.JDK_7X.home}/jre/classes:${platforms.JDK_7X.home}/jre/lib/ext/dnsns.jar:${platforms.JDK_7X.home}/jre/lib/ext/localedata.jar:${platforms.JDK_7X.home}/jre/lib/ext/sunjce_provider.jar:${platforms.JDK_7X.home}/jre/lib/ext/sunpkcs11.jar
 platforms.JDK_7X.compiler=modern
+platforms.JDK_7X.home=${file.reference.davinci}/sources/build/bsd-i586
+#
+# These probably need to be pre-defined, in ../build.properties:
+#
+file.reference.davinci=${user.home}/Projects/davinci
+libs.junit_4.classpath=${user.home}/env/jars/junit-4.1.jar
+# e.g., ln -s ...davinci/sources/build/bsd-i586/j2sdk-image ~/env/JAVA7X_HOME
 platforms.JDK_7X.home=${user.home}/env/JAVA7X_HOME
-platforms.JDK_7X.home=${project.davinci}/sources/build/bsd-i586
-project.davinci=${user.home}/Projects/davinci
-libs.junit_4.classpath=${user.home}/env/jars/junit-4.1.jar
--- a/netbeans/meth/build.xml	Fri Sep 24 16:09:59 2010 -0700
+++ b/netbeans/meth/build.xml	Fri Sep 24 16:10:11 2010 -0700
@@ -4,6 +4,10 @@
 <!-- (If you delete it and reopen the project it will be recreated.) -->
 <project name="MethodHandle" default="default" basedir=".">
     <description>Builds, tests, and runs the project MethodHandle.</description>
+
+    <!-- see end of nbproject/project.properties for properties that might need patching here: -->
+    <property name="user.properties.file" value="build.properties"/>
+
     <import file="nbproject/build-impl.xml"/>
 
     <!-- build a bundle of the tests -->
--- a/netbeans/meth/nbproject/project.properties	Fri Sep 24 16:09:59 2010 -0700
+++ b/netbeans/meth/nbproject/project.properties	Fri Sep 24 16:10:11 2010 -0700
@@ -5,7 +5,7 @@
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form,**/*.orig,**/*.rej
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
@@ -36,16 +36,20 @@
 javac.classpath=
 #    ${file.reference.bsd-i586-classes}
 # Space-separated list of extra javac options
+javac.compilerargs= -Xbootclasspath/p:${build.classes.dir} -Xlint:none -XDallowTransitionalJSR292=${allowTransitionalJSR292} ${javac.standalone.bcp}
+# choices: yes, no, only
+allowTransitionalJSR292=only
 # assuming full JDK_7X:
-javac.compilerargs=-Xlint:unchecked -XDinvokedynamic -nowarn -Xlint:none
-# without full JDK_7X:
-#javac.compilerargs=-Xlint:unchecked -J-Xbootclasspath/p:${reference.langtools-javac.jar} -XDinvokedynamic -Xbootclasspath/p:${build.classes.dir}
+#javac.standalone.bcp =
+# pulling from a standalone langtools build:
+javac.standalone.bcp = -J-Xbootclasspath/p:${reference.langtools-javac.jar}
 javac.deprecation=false
-javac.source=1.6
-javac.target=1.6
+javac.source=1.7
+javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
     ${libs.junit_4.classpath}
 javadoc.additionalparam=-protected
 #javadoc.access=protected
@@ -55,7 +59,6 @@
 javadoc.nonavbar=true
 javadoc.notree=true
 javadoc.private=false
-#javadoc.private=false
 javadoc.splitindex=false
 javadoc.use=true
 javadoc.version=false
@@ -87,10 +90,10 @@
     ${build.test.classes.dir}
 source.encoding=UTF-8
 # One or more refs probably need fixing:
-file.reference.projects=${user.home}/Projects
-file.reference.davinci.sources.jdk=${file.reference.projects}/davinci/sources/jdk
+file.reference.davinci.sources.jdk=${file.reference.davinci}/sources/jdk
+file.reference.davinci.sources.langtools=${file.reference.davinci}/sources/langtools
 #was: reference.langtools-javac.jar=${platforms.JDK_7X.home}/lib/tools.jar
-reference.langtools-javac.jar=${project.langtools}/dist/bootstrap/lib/javac.jar
+reference.langtools-javac.jar=${file.reference.davinci.sources.langtools}/dist/lib/javac.jar
 src.src.dir=${file.reference.davinci.sources.jdk}/src/share/classes
 test.src.dir=test
 project.license=openjdk
@@ -99,10 +102,12 @@
 # these should be globally defined in most setups, but are given here locally for completeness:
 platforms.JDK_7X.bootclasspath=${platforms.JDK_7X.home}/jre/lib/resources.jar:${platforms.JDK_7X.home}/jre/lib/rt.jar:${platforms.JDK_7X.home}/jre/lib/sunrsasign.jar:${platforms.JDK_7X.home}/jre/lib/jsse.jar:${platforms.JDK_7X.home}/jre/lib/jce.jar:${platforms.JDK_7X.home}/jre/lib/charsets.jar:${platforms.JDK_7X.home}/jre/classes:${platforms.JDK_7X.home}/jre/lib/ext/dnsns.jar:${platforms.JDK_7X.home}/jre/lib/ext/localedata.jar:${platforms.JDK_7X.home}/jre/lib/ext/sunjce_provider.jar:${platforms.JDK_7X.home}/jre/lib/ext/sunpkcs11.jar
 platforms.JDK_7X.compiler=modern
-platforms.JDK_7X.home=${user.home}/env/JAVA7X_HOME
-# e.g., ln -s ...davinci/sources/build/bsd-i586/j2sdk-image ~/env/JAVA7X_HOME
-#platforms.JDK_7X.home=${project.davinci}/sources/build/bsd-i586
-#project.davinci=${user.home}/Projects/davinci/j2sdk-image
-libs.junit_4.classpath=${user.home}/env/jars/junit-4.5.jar
 platform.java=${platforms.JDK_7X.home}/bin/java
 test.tests-from-jdk.dir=${file.reference.davinci.sources.jdk}
+#
+# These probably need to be pre-defined, in ../build.properties:
+#
+file.reference.davinci=${user.home}/Projects/davinci
+libs.junit_4.classpath=${user.home}/env/jars/junit-4.5.jar
+# e.g., ln -s ...davinci/sources/build/bsd-i586/j2sdk-image ~/env/JAVA7X_HOME
+platforms.JDK_7X.home=${user.home}/env/JAVA7X_HOME