Minor build system updates

- Automatically set copyright date in Version class to current year
- parameterize source and target for javac, but leave at 1.6.  Setting source to
1.8 prompts the compiler to error "source release 1.8 requires target release 1.8"
- java compile target now uses deprecation and debug values set in -init target
- removed optimization argument.  Compiler ignores it
This commit is contained in:
Steve Wadsworth 2018-12-18 14:04:33 -08:00 committed by Dale Schultz
parent ed91aa4351
commit 8a87885b70
2 changed files with 138 additions and 156 deletions

View File

@ -73,19 +73,11 @@
<property name="izpack.compile.${os.linux}" value="compile" /> <property name="izpack.compile.${os.linux}" value="compile" />
<!-- java compiler properties --> <!-- java compiler properties -->
<property name="javac.source" value="1.6" />
<property name="javac.target" value="1.6" />
<property name="debug" value="off" /> <property name="debug" value="off" />
<property name="optimize" value="on"/>
<property name="deprecation" value="on" /> <property name="deprecation" value="on" />
<!-- get the current svn revision (needed by version.properties) - if repository is unavailable, this will be zero
<macro_svn_revision repository="https://svn2.assembla.com/svn/romraider" property="svn.revision"/> -->
<!-- Set the buildnumber to be the revision fetched from the repository, but default to zero for
offline work -->
<condition property="buildnumber" value="${svn.revision}" else="0">
<isset property="svn.revision"/>
</condition>
<!-- version properties are set in this file, both for the product itself and <!-- version properties are set in this file, both for the product itself and
for some of the external dependencies (jar files and such) --> for some of the external dependencies (jar files and such) -->
<property file="version.properties" /> <property file="version.properties" />
@ -134,6 +126,7 @@
<!-- this set of filters should contain all the substitutions needed --> <!-- this set of filters should contain all the substitutions needed -->
<filterset id="version.filterset"> <filterset id="version.filterset">
<filter token="time.year" value="${time.year}" />
<filter token="warning.generated-file" value="${warning.generated-file}" /> <filter token="warning.generated-file" value="${warning.generated-file}" />
<filter token="name.package" value="${name.package}" /> <filter token="name.package" value="${name.package}" />
<filter token="description.package" value="${description.package}" /> <filter token="description.package" value="${description.package}" />
@ -252,28 +245,6 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Macros --> <!-- Macros -->
<!-- =================================================================== --> <!-- =================================================================== -->
<macrodef name="macro_svn_revision">
<attribute name="revision" default="HEAD"/>
<attribute name="repository"/>
<attribute name="property"/>
<sequential>
<tempfile property="svninfo.log"/>
<exec executable="git" output="${svninfo.log}" failonerror="false">
<arg line="describe --always"/>
</exec>
<loadfile property="@{property}" srcFile="${svninfo.log}">
<filterchain>
<linecontainsregexp>
<regexp pattern="Last Changed Rev: "/>
</linecontainsregexp>
<deletecharacters chars="Last Changed Rev: "/>
<striplinebreaks/>
</filterchain>
</loadfile>
<delete file="${svninfo.log}"/>
</sequential>
</macrodef>
<macrodef name="macro_generate_executables"> <macrodef name="macro_generate_executables">
<sequential> <sequential>
<!-- create the exe launcher of the package for Windows --> <!-- create the exe launcher of the package for Windows -->
@ -335,8 +306,19 @@
<attribute name="os" /> <attribute name="os" />
<sequential> <sequential>
<mkdir dir="${classes.dir}" /> <mkdir dir="${classes.dir}" />
<javac failonerror="true" srcdir="${src.java.dir}" destdir="${classes.dir}" target="1.6" source="1.6" includeantruntime="false" debug="on"> <javac
failonerror="true"
srcdir="${src.java.dir}"
destdir="${classes.dir}"
source="${javac.source}"
target="${javac.target}"
includeantruntime="false"
debug="${debug}"
deprecation="${deprecation}">
<classpath refid="@{os}.classpath" /> <classpath refid="@{os}.classpath" />
<!--
<compilerarg value="-Xlint" />
-->
</javac> </javac>
</sequential> </sequential>
</macrodef> </macrodef>

View File

@ -1,6 +1,6 @@
/* /*
* RomRaider Open-Source Tuning, Logging and Reflashing * RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2015 RomRaider.com * Copyright (C) 2006-@time.year@ RomRaider.com
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by