This commit is contained in:
Tim
2019-08-13 17:56:52 +02:00
parent baa3adf8e3
commit 23a96b64eb
10 changed files with 386 additions and 57 deletions
+18
View File
@@ -1079,6 +1079,15 @@ is divided into following sections:
<propertyfile file="${built-jar.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-jar.properties}"/>
<param location="${project.rtplib}" name="call.subproject"/>
<param location="${project.rtplib}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
<param name="transfer.not.archive.disabled" value="true"/>
<param name="transfer.do.jlink" value="false"/>
</antcall>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
@@ -1735,6 +1744,15 @@ is divided into following sections:
<propertyfile file="${built-clean.properties}">
<entry key="${basedir}" value=""/>
</propertyfile>
<antcall target="-maybe-call-dep">
<param name="call.built.properties" value="${built-clean.properties}"/>
<param location="${project.rtplib}" name="call.subproject"/>
<param location="${project.rtplib}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
<param name="transfer.not.archive.disabled" value="true"/>
<param name="transfer.do.jlink" value="false"/>
</antcall>
</target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
+3 -3
View File
@@ -3,6 +3,6 @@ build.xml.script.CRC32=53e451ff
build.xml.stylesheet.CRC32=f85dc8f2@1.90.1.48
# 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=f69c57db
nbproject/build-impl.xml.script.CRC32=2b6978ab
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.90.1.48
nbproject/build-impl.xml.data.CRC32=9558f99f
nbproject/build-impl.xml.script.CRC32=4415df3d
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
+35 -11
View File
@@ -1,21 +1,31 @@
#Tue Jun 11 17:15:12 CEST 2019
excludes=
file.reference.jain-sip-api-1.2.1.4.jar-1=C:\\Users\\Tim\\Desktop\\VoIP PA\\VoIPProjekt\\VoIPProjekt\\lib\\jain-sip-api-1.2.1.4.jar
file.reference.jain-sip-ri-1.2.327.jar-1=C:\\Users\\Tim\\Desktop\\VoIP PA\\VoIPProjekt\\VoIPProjekt\\lib\\jain-sip-ri-1.2.327.jar
file.reference.junit-4.12.jar-1=C:\\Users\\Tim\\Desktop\\VoIP PA\\VoIPProjekt\\VoIPProjekt\\lib\\junit-4.12.jar
file.reference.log4j-1.2.17.jar-1=C:\\Users\\Tim\\Desktop\\VoIP PA\\VoIPProjekt\\VoIPProjekt\\lib\\log4j-1.2.17.jar
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit_4.classpath}:\
${libs.hamcrest.classpath}
run.classpath=${javac.classpath}\:${build.classes.dir}
javac.processorpath=${javac.classpath}
project.rtplib=../../rtplib
reference.rtplib.jar=${project.rtplib}/dist/rtplib.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.processorpath=\
${javac.classpath}
dist.javadoc.dir=${dist.dir}/javadoc
test.src.dir=test
file.reference.junit-4.12.jar=lib\\junit-4.12.jar
run.modulepath=${javac.modulepath}
run.modulepath=\
${javac.modulepath}
annotation.processing.enabled=true
file.reference.jain-sip-ri-1.2.327.jar=lib\\jain-sip-ri-1.2.327.jar
build.sysclasspath=ignore
debug.modulepath=${run.modulepath}
javac.compilerargs=
javac.compilerargs=-g
javadoc.noindex=false
javadoc.private=false
file.reference.log4j-1.2.17.jar=lib\\log4j-1.2.17.jar
@@ -24,7 +34,7 @@ endorsed.classpath=
main.class=phone.Start
junit.selected.version=4
source.encoding=UTF-8
javac.source=11
javac.source=1.8
includes=**
javadoc.use=true
jar.compress=false
@@ -43,9 +53,16 @@ javac.processormodulepath=
run.jvmargs=
jlink.additionalmodules=
javadoc.encoding=${source.encoding}
javac.classpath=${file.reference.jain-sip-api-1.2.1.4.jar}\:${file.reference.jain-sip-ri-1.2.327.jar}\:${file.reference.junit-4.12.jar}\:${file.reference.log4j-1.2.17.jar}
javac.classpath=\
${file.reference.jain-sip-api-1.2.1.4.jar}:\
${file.reference.jain-sip-ri-1.2.327.jar}:\
${file.reference.junit-4.12.jar}:\
${file.reference.log4j-1.2.17.jar}:\
${libs.RTPLibrary.classpath}:\
${reference.rtplib.jar}
mkdist.disabled=false
run.test.modulepath=${javac.test.modulepath}
run.test.modulepath=\
${javac.test.modulepath}
build.classes.excludes=**/*.java,**/*.form
dist.jlink.dir=${dist.dir}/jlink
dist.jar=${dist.dir}/Phone.jar
@@ -62,19 +79,26 @@ annotation.processing.source.output=${build.generated.sources.dir}/ap-source-out
build.generated.dir=${build.dir}/generated
javadoc.version=false
application.title=Phone
javac.test.modulepath=${javac.modulepath}
javac.test.modulepath=\
${javac.modulepath}
debug.test.classpath=${run.test.classpath}
javac.external.vm=true
javac.target=11
javac.target=1.8
platform.active=default_platform
manifest.file=manifest.mf
javadoc.html5=false
javac.test.processorpath=${javac.test.classpath}
meta.inf.dir=${src.dir}/META-INF
run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
dist.jlink.output=${dist.jlink.dir}/Phone
annotation.processing.run.all.processors=true
javac.modulepath=
javac.modulepath=\
${file.reference.jain-sip-api-1.2.1.4.jar-1}:\
${file.reference.jain-sip-ri-1.2.327.jar-1}:\
${file.reference.junit-4.12.jar-1}:\
${file.reference.log4j-1.2.17.jar-1}
src.dir=src
jlink.additionalparam=
debug.classpath=${run.classpath}
+10
View File
@@ -11,5 +11,15 @@
<root id="test.src.dir"/>
</test-roots>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
<reference>
<foreign-project>rtplib</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
</references>
</configuration>
</project>