Agregado calendario

juanBalian35 · Nov 25, 2019 · ef9e656 · ef9e656
1 parent 4076002
commit ef9e656
Show file tree

Hide file tree

Showing 11 changed files with 4,165 additions and 63 deletions.
diff --git a/nbproject/UPDATED.TXT b/nbproject/UPDATED.TXT
@@ -5,7 +5,7 @@ Project Introini-Balian build script updated
 Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
 as compliant with this version of NetBeans JavaFX support module. To ensure correct
 and complete functionality within this NetBeans installation the script file has been
-backed up to jfx-impl_backup_8.xml and then updated to the currently supported state.
+backed up to jfx-impl_backup_9.xml and then updated to the currently supported state.
 
 FX Project build script auto-update may be triggered on project open either after
 NetBeans installation update or by manual changes in jfx-impl.xml. Please note that

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -55,7 +55,43 @@ is divided into following sections:
  <property file="nbproject/project.properties"/>
  </target>
  <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <property name="platform.java" value="${java.home}/bin/java"/>
+ <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+ <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+ <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+ <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+ <condition property="platform.javac" value="${platform.home}/bin/javac">
+ <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+ </condition>
+ <property name="platform.javac" value="${platform.javac.tmp}"/>
+ <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+ <condition property="platform.java" value="${platform.home}/bin/java">
+ <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+ </condition>
+ <property name="platform.java" value="${platform.java.tmp}"/>
+ <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+ <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+ <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+ </condition>
+ <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+ <condition property="platform.invalid" value="true">
+ <or>
+ <contains string="${platform.javac}" substring="$${platforms."/>
+ <contains string="${platform.java}" substring="$${platforms."/>
+ <contains string="${platform.javadoc}" substring="$${platforms."/>
+ </or>
+ </condition>
+ <fail unless="platform.home">Must set platform.home</fail>
+ <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+ <fail unless="platform.java">Must set platform.java</fail>
+ <fail unless="platform.javac">Must set platform.javac</fail>
+ <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+ ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+ or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
+ </fail>
  <available file="${manifest.file}" property="manifest.available"/>
  <condition property="splashscreen.available">
  <and>
@@ -185,20 +221,6 @@ is divided into following sections:
  <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
  <isset property="profile.available"/>
  </condition>
- <condition else="false" property="jdkBug6558476">
- <and>
- <matches pattern="1\.[56]" string="${java.specification.version}"/>
- <not>
- <os family="unix"/>
- </not>
- </and>
- </condition>
- <condition else="false" property="javac.fork">
- <or>
- <istrue value="${jdkBug6558476}"/>
- <istrue value="${javac.external.vm}"/>
- </or>
- </condition>
  <property name="jar.index" value="false"/>
  <property name="jar.index.metainf" value="${jar.index}"/>
  <property name="copylibs.rebase" value="true"/>
@@ -268,7 +290,7 @@ is divided into following sections:
  <property location="${build.dir}/empty" name="empty.dir"/>
  <mkdir dir="${empty.dir}"/>
  <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
  <src>
  <dirset dir="@{gensrcdir}" erroronmissingdir="false">
  <include name="*"/>
@@ -308,7 +330,7 @@ is divided into following sections:
  <sequential>
  <property location="${build.dir}/empty" name="empty.dir"/>
  <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
  <src>
  <dirset dir="@{gensrcdir}" erroronmissingdir="false">
  <include name="*"/>
@@ -389,7 +411,7 @@ is divided into following sections:
  <element name="customize" optional="true"/>
  <sequential>
  <property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
  <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
  <syspropertyset>
  <propertyref prefix="test-sys-prop."/>
@@ -412,7 +434,7 @@ is divided into following sections:
  <element name="customize" optional="true"/>
  <sequential>
  <property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
  <batchtest todir="${build.test.results.dir}">
  <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
  <filename name="@{testincludes}"/>
@@ -451,7 +473,7 @@ is divided into following sections:
  </fileset>
  </union>
  <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
- <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Introini-Balian" testname="TestNG tests" workingDir="${work.dir}">
+ <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Introini-Balian" testname="TestNG tests" workingDir="${work.dir}">
  <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
  <propertyset>
  <propertyref prefix="test-sys-prop."/>
@@ -531,7 +553,7 @@ is divided into following sections:
  <element name="customize" optional="true"/>
  <sequential>
  <property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
  <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
  <syspropertyset>
  <propertyref prefix="test-sys-prop."/>
@@ -556,7 +578,7 @@ is divided into following sections:
  <element name="customize" optional="true"/>
  <sequential>
  <property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
  <batchtest todir="${build.test.results.dir}">
  <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
  <filename name="@{testincludes}"/>
@@ -736,6 +758,9 @@ is divided into following sections:
  <classpath>
  <path path="@{classpath}"/>
  </classpath>
+ <bootclasspath>
+ <path path="${platform.bootcp}"/>
+ </bootclasspath>
  </nbjpdastart>
  </sequential>
  </macrodef>
@@ -751,7 +776,9 @@ is divided into following sections:
  </macrodef>
  </target>
  <target name="-init-debug-args">
- <property name="version-output" value="java version &quot;${ant.java.version}"/>
+ <exec executable="${platform.java}" outputproperty="version-output">
+ <arg value="-version"/>
+ </exec>
  <condition property="have-jdk-older-than-1.4">
  <or>
  <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -776,7 +803,7 @@ is divided into following sections:
  <attribute default="${debug.classpath}" name="classpath"/>
  <element name="customize" optional="true"/>
  <sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
  <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
  <jvmarg line="${debug-args-line}"/>
  <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -803,7 +830,7 @@ is divided into following sections:
  <attribute default="jvm" name="jvm"/>
  <element name="customize" optional="true"/>
  <sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
  <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
  <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
  <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1001,7 +1028,7 @@ is divided into following sections:
  <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
  <echo level="info">To run this application from the command line without Ant, try:</echo>
  <property location="${dist.jar}" name="dist.jar.resolved"/>
- <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+ <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
  </target>
  <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
  <j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1210,10 +1237,13 @@ is divided into following sections:
  </not>
  </and>
  </condition>
+ <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
+ <arg value="-version"/>
+ </exec>
  <condition else="" property="bug5101868workaround" value="*.java">
- <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+ <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
  </condition>
- <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+ <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
  <classpath>
  <path path="${javac.classpath}"/>
  </classpath>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=a60cfe04
 build.xml.stylesheet.CRC32=[email protected]
 # 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=d80cd96b
-nbproject/build-impl.xml.script.CRC32=8ab6f21b
+nbproject/build-impl.xml.data.CRC32=be61e09a
+nbproject/build-impl.xml.script.CRC32=325bf9bb
 nbproject/build-impl.xml.stylesheet.CRC32=[email protected]