|
From: <yu...@us...> - 2018-12-28 12:49:03
|
Revision: 2364
http://sourceforge.net/p/swingme/code/2364
Author: yuranet
Date: 2018-12-28 12:49:01 +0000 (Fri, 28 Dec 2018)
Log Message:
-----------
netbeans project update
Modified Paths:
--------------
me4se/nbproject/build-impl.xml
me4se/nbproject/genfiles.properties
me4se/nbproject/project.properties
me4se/nbproject/project.xml
Modified: me4se/nbproject/build-impl.xml
===================================================================
--- me4se/nbproject/build-impl.xml 2018-12-24 02:14:48 UTC (rev 2363)
+++ me4se/nbproject/build-impl.xml 2018-12-28 12:49:01 UTC (rev 2364)
@@ -125,9 +125,9 @@
</condition>
<condition property="have.sources">
<or>
- <available file="${src.m3g_basic.dir}"/>
<available file="${src.dir}"/>
- <available file="${src.swingme.dir}"/>
+ <available file="${src.src.dir}"/>
+ <available file="${src.src2.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -230,9 +230,9 @@
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.m3g_basic.dir">Must set src.m3g_basic.dir</fail>
<fail unless="src.dir">Must set src.dir</fail>
- <fail unless="src.swingme.dir">Must set src.swingme.dir</fail>
+ <fail unless="src.src.dir">Must set src.src.dir</fail>
+ <fail unless="src.src2.dir">Must set src.src2.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
<fail unless="dist.dir">Must set dist.dir</fail>
<fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -253,7 +253,7 @@
</target>
<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.m3g_basic.dir}:${src.dir}:${src.swingme.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.src.dir}:${src.src2.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -294,7 +294,7 @@
</target>
<target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.m3g_basic.dir}:${src.dir}:${src.swingme.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.src.dir}:${src.src2.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -327,7 +327,7 @@
</target>
<target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.m3g_basic.dir}:${src.dir}:${src.swingme.dir}" name="srcdir"/>
+ <attribute default="${src.dir}:${src.src.dir}:${src.src2.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -915,14 +915,14 @@
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.m3g_basic.dir}:${src.dir}:${src.swingme.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.dir}:${src.src.dir}:${src.src2.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
<copy todir="${build.classes.dir}">
- <fileset dir="${src.m3g_basic.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${src.swingme.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
<target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -943,7 +943,7 @@
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.m3g_basic.dir}:${src.dir}:${src.swingme.dir}"/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}:${src.src.dir}:${src.src2.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1209,13 +1209,13 @@
<classpath>
<path path="${javac.classpath}"/>
</classpath>
- <fileset dir="${src.m3g_basic.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <fileset dir="${src.src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.swingme.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+ <fileset dir="${src.src2.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1225,13 +1225,13 @@
<arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.m3g_basic.dir}" excludes="${excludes}" includes="${includes}">
+ <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+ <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.swingme.dir}" excludes="${excludes}" includes="${includes}">
+ <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
Modified: me4se/nbproject/genfiles.properties
===================================================================
--- me4se/nbproject/genfiles.properties 2018-12-24 02:14:48 UTC (rev 2363)
+++ me4se/nbproject/genfiles.properties 2018-12-28 12:49:01 UTC (rev 2364)
@@ -3,6 +3,6 @@
build.xml.stylesheet.CRC32=958a1d3e@1.26.1.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=79895ded
-nbproject/build-impl.xml.script.CRC32=a0dd947f
+nbproject/build-impl.xml.data.CRC32=5f6434d3
+nbproject/build-impl.xml.script.CRC32=7e1d7101
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
Modified: me4se/nbproject/project.properties
===================================================================
--- me4se/nbproject/project.properties 2018-12-24 02:14:48 UTC (rev 2363)
+++ me4se/nbproject/project.properties 2018-12-28 12:49:01 UTC (rev 2364)
@@ -82,5 +82,5 @@
${build.test.classes.dir}
source.encoding=windows-1252
src.dir=${file.reference.me4se-src}
-src.m3g_basic.dir=opt\\m3g_basic
-src.swingme.dir=opt/swingme
+src.src.dir=opt/m3g_basic/src
+src.src2.dir=opt/swingme/src
Modified: me4se/nbproject/project.xml
===================================================================
--- me4se/nbproject/project.xml 2018-12-24 02:14:48 UTC (rev 2363)
+++ me4se/nbproject/project.xml 2018-12-28 12:49:01 UTC (rev 2364)
@@ -5,9 +5,9 @@
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>me4se</name>
<source-roots>
- <root id="src.m3g_basic.dir"/>
<root id="src.dir"/>
- <root id="src.swingme.dir"/>
+ <root id="src.src.dir" name="opt/m3g_basic"/>
+ <root id="src.src2.dir" name="opt/swingme"/>
</source-roots>
<test-roots/>
</data>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
