Skip to content

Commit

Permalink
Merge branch 'release/v0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
WFMJ7631 authored and WFMJ7631 committed Sep 29, 2020
2 parents d38345b + 0a1bd66 commit eaba5f4
Show file tree
Hide file tree
Showing 1,536 changed files with 81,241 additions and 328,328 deletions.
6 changes: 0 additions & 6 deletions bdv.naf.xml
View file

This file was deleted.

241 changes: 69 additions & 172 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,13 @@
nbproject/build-impl.xml file.
-->
<!--<target name="-post-jar">
</target>-->



<target name="yguard">
<taskdef name="yguard"
classname="com.yworks.yguard.YGuardTask"
classpath="tools/yguard.jar"/>
<yguard>

<inoutpair in="store/TourMa.jar" out="store/TourMa_obf.jar" resources="copy"/>

<yguard>
<inoutpair in="dist/TourMa.jar" out="dist/TourMa_obf.jar" resources="copy"/>
<externalclasses>
<pathelement location="deps/jython-2.2.jar"/>
<pathelement location="deps/j2ee-1.4.jar"/>
Expand All @@ -103,110 +97,109 @@
<pathelement location="deps/avalon-framework-impl-4.3.1.jar"/>
<pathelement location="deps/org.apache.servicemix.bundles.xmlresolver-1.2_1.jar" />
</externalclasses>

<shrink logfile="shrinklog.xml" createStubs="true">
<property name="error-checking" value="pedantic"/>
<shrink logfile="shrinklog.xml" createStubs="false">
<!--entrypointjar name="store/TourMa.jar"/>-->
<!--<property name="error-checking" value="pedantic"/>-->
<keep>
<!-- Main Class -->
<method name="void main(java.lang.String[])" class="tourma.MainFrame" />
<class name="freemarker.ext.xml.NodeOperator"/>
<class name="freemarker.ext.xml.Navigator$XPathEx"/>
<class classes="public"/>
<class classes="public" methods="public">
<class name="tourma.MainFrame" />
</keep>
</shrink>
</yguard>
</target>

<target name="yguard-libs" depends="jar">
<taskdef name="yguard"
classname="com.yworks.yguard.YGuardTask"
classpath="tools/yguard.jar"/>
<yguard>
<inoutpairs resources="copy">
<fileset dir="libs">
<include name="*.jar"/>
</fileset>
<mapper type="glob" from="*.jar" to="../obfuscate/libs/*.jar"/>
</inoutpairs>
<!--<inoutpair in="libs/jfreechart-1.0.15.jar" out="../obfuscate/jfreechart-1.0.15.jar" resources="copy"/> -->
<shrink logfile="shrinklog.xml" createStubs="false">
<entrypointjar name="dist/TourMa.jar"/>
<!--<property name="error-checking" value="pedantic"/>-->
<keep>
<class classes="none" methods="public">
<patternset>

<!-- L'implémentation duparseur XML est choisie à la volée, donc difficile à gérer pour le "shrinker" -->
<include name="org.apache.xerces.parsers.SAXParser"/>
<include name="org.apache.xerces.xni.parser.XMLConfigurationException"/>
<include name="org.apache.xerces.parsers.XIncludeAwareParserConfiguration"/>
<include name="org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl"/>
<include name="org.jfree.chart.resources.JFreeChartResources"/>
<include name="org.jfree.resources.JCommonResources"/>
</patternset>
</class>
</keep>
</shrink>

<rename mainclass="tourma.MainFrame" logfile="renamelog.xml" replaceClassNameStrings="true">
<property name="error-checking" value="pedantic"/>
<property name="naming-scheme" value="small" />
<keep>
<class classes="public" methods="public" fields="public" >
<class >
<patternset>
<include name="org.jfree.chart.resources.*"/>
<include name="tourma.views.report.*"/>
<include name="teamma.views.report.*"/>
<!-- Images de l'objet JCalendar -->
<include name="com.toedter.calendar.images.*"/>
</patternset>
</class>
</keep>
<adjust replacePath="false">
<include name="tourma/images/*"/>
<include name="teamma/images/*"/>
<include name="teamma/rules/*"/>
<include name="com/toedter/calendar/images/*"/>
<include name="org/jfree/chart/*"/>
<include name="org/jfree/chart/editor/*"/>
<include name="org/jfree/chart/plot/*"/>
<include name="org/jfree/chart/resources/*"/>
<include name="com/toedter/components/images/*"/>
<include name="tourma/languages/*"/>
<include name="tourma/views/report/*"/>
<include name="teamma/views/report/*"/>
<include name="tourma/*"/>
<include name="org/jfree/chart/resources/*"/>
<include name="org/jfree/resources/*"/>
<include name="com/google/zxing/aztec/decoder/*"/>
<include name="freemarker/ext/xml/*"/>
<include name="javax/xml/bind/*"/>
</adjust>
<adjust replaceName="false">
<include name="**/*.properties"/>
<include name="**/*.html"/>
<include name="**/*.xml"/>
<include name="teamma/views/report/jdgPrintableRoster*"/>
<include name="tourma/views/report/jdgRanking*"/>
<include name="tourma/views/report/jdgGlobal*"/>
<include name="tourma/views/report/jdgRound*"/>
<include name="**/JFreeChartResources*"/>
<include name="**/JCommonResources*"/>
<include name="freemarker/ext/xml/*"/>
<include name="javax/xml/bind/*"/>
</adjust>

</rename>

</shrink>
</yguard>
</target>

<target name="package-for-store" depends="jar">

<!-- Change the value of this property to be the name of your JAR,
minus the .jar extension. It should not have spaces.
<property name="store.jar.name" value="MyJarName"/>
-->
<property name="store.jar.name" value="TourMa"/>

<!-- don't edit below this line -->

<property name="store.dir" value="store"/>
<property name="libs.dir" value="libs"/>
<property name="store.jar" value="${store.dir}/${store.jar.name}.jar"/>

<echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>

<delete file="${store.dir}/*.jar"/>
<mkdir dir="${store.dir}"/>

<jar destfile="${store.dir}/temp_final.jar" filesetmanifest="skip">
<zipgroupfileset dir="dist" includes="*.jar"/>
<zipgroupfileset dir="dist/lib" includes="*.jar"/>

<zipgroupfileset dir="libs" includes="*.jar"/>
<manifest>
<attribute name="Main-Class" value="${main.class}"/>
</manifest>
</jar>

<zip destfile="${store.jar}">
<zipfileset src="${store.dir}/temp_final.jar"
excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
</zip>

<delete file="${store.dir}/temp_final.jar"/>

</target>

<target name="package-for-store_obf" depends="jar, yguard-libs,yguard">
<!-- Change the value of this property to be the name of your JAR,
minus the .jar extension. It should not have spaces.
<property name="store.jar.name" value="MyJarName"/>
-->
<property name="store.jar.name" value="TourMa"/>
<property name="store.dir" value="store"/>
<property name="libs.dir" value="obfuscate/libs"/>
<property name="store.jar" value="${store.dir}/${store.jar.name}_obf.jar"/>
<echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
<delete file="${store.dir}/*_obf.jar"/>
<mkdir dir="${store.dir}"/>
<jar destfile="${store.dir}/temp_final.jar" filesetmanifest="skip">
<zipgroupfileset dir="dist" includes="*_obf.jar"/>
<zipgroupfileset dir="obfuscate/libs" includes="*.jar"/>

<manifest>
<attribute name="Main-Class" value="${main.class}"/>
</manifest>
</jar>
<zip destfile="${store.jar}">
<zipfileset src="${store.dir}/temp_final.jar"
excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
</zip>
<delete file="${store.dir}/temp_final.jar"/>
</target>

<target name="analyzer" depends="compile">
<taskdef name="jaranalyzer"
Expand All @@ -222,103 +215,7 @@
<jaranalyzer srcdir="store"
destfile="tools/dependencies.xml"
summaryclass="com.kirkk.analyzer.textui.XMLUISummary" packageFilter="java.*;javax.*;" jarFilter="Somejar.jar" />
<xslt in="tools/dependencies.xml" out="tools/dependencies.html" style="tools/jaranalyzer.xsl"/>
<xslt in="tools/dependencies.xml" out="tools/dependencies.html" style="tools/jaranalyzer.xsl"/>
</target>

<target name="proguard" depends="package-for-store">

<property name="proguard.jar" value="tools/proguard.jar" />

<taskdef resource="proguard/ant/task.properties" classpath="${proguard.jar}" />
<proguard configuration="proguard.cfg"/>

<!--<property name="proguard.jar.path" value="tools/proguard.jar" />
<property name="proguard.dir" value="tools/proguard.jar" />
<property name="java.home.path" value="C:/Program Files/Java/jdk1.8.0_151" />
<property name="dist.jar" value="store/TourMa.jar" />
<taskdef resource="proguard/ant/task.properties" classpath="${proguard.jar.path}" />
<echo message="Obfuscating ${dist.jar}..."/>
<mkdir dir="${build.dir}/obfuscated"/>
<proguard printmapping="store/obfuscated/tourma.map" renamesourcefileattribute="SourceFile" ignorewarnings="true">
<injar file="store/TourMa.jar" />
<outjar file="store/TourMal.jar" />
<libraryjar path="${javac.classpath}" />
<libraryjar file="${java.home.path}/jre/lib/rt.jar" />
<keepattribute name="InnerClasses" />
<keepattribute name="SourceFile" />
<keepattribute name="LineNumberTable" />
<keepattribute name="Deprecated" />
<keepattribute name="*Annotation*" />
<keepattribute name="Signature" />
Preserve all public classes, and their public and protected fields and methods.
<keep access="public">
<field access="public protected" />
<method access="public protected" />
</keep>
<keepclassmembernames access="public">
<method type ="java.lang.Class"
name ="class$"
parameters="java.lang.String" />
<method type ="java.lang.Class"
name ="class$"
parameters="java.lang.String,boolean" />
</keepclassmembernames>
<keepclasseswithmembernames>
<method access="native" />
</keepclasseswithmembernames>
<keepclassmembers extends="java.lang.Enum">
<method access="public static"
type="**[]"
name="values"
parameters="" />
<method access="public static"
type="**"
name="valueOf"
parameters="java.lang.String" />
</keepclassmembers>
<keepnames implements="java.io.Serializable"/>
<keepclassmembers implements="java.io.Serializable">
<field access ="final"
type ="long"
name ="serialVersionUID" />
<field access ="!static !transient"
name ="**"/>
<field access ="!private"
name ="**"/>
<method access ="!private"
name ="**"/>
<method access ="private"
type ="void"
name ="writeObject"
parameters="java.io.ObjectOutputStream" />
<method access ="private"
type ="void"
name ="readObject"
parameters="java.io.ObjectOutputStream" />
<method type ="java.lang.Object"
name ="writeReplace"
parameters="" />
<method type ="java.lang.Object"
name ="readResolve"
parameters="" />
</keepclassmembers>
</proguard>-->
</target>


</project>
0 deps_old/jdom.jar → deps/jdom.jar
View file
File renamed without changes.
0 deps_old/jsp-api-2.1.jar → deps/jsp-api-2.1.jar
View file
File renamed without changes.
0 deps_old/jdom/lib/xml-apis.jar → deps/xml-apis.jar
View file
File renamed without changes.
0 deps/jsp-api-2.0.jar → deps_old/jsp-api-2.0.jar
View file
File renamed without changes.
0 deps_old/fest-swing-1.2/LICENSE.txt → deps_tests/fest-swing-1.2/LICENSE.txt
View file
File renamed without changes.
0 ...ns/junit/fest-swing-junit-1.2/LICENSE.txt → ...ns/junit/fest-swing-junit-1.2/LICENSE.txt
View file
File renamed without changes.
0 ...unit-1.2/fest-swing-junit-1.2-sources.jar → ...unit-1.2/fest-swing-junit-1.2-sources.jar
View file
File renamed without changes.
0 ...-swing-junit-1.2/fest-swing-junit-1.2.jar → ...-swing-junit-1.2/fest-swing-junit-1.2.jar
View file
File renamed without changes.
0 ...nit-1.2/lib/commons-codec-1.3-sources.jar → ...nit-1.2/lib/commons-codec-1.3-sources.jar
View file
File renamed without changes.
0 ...swing-junit-1.2/lib/commons-codec-1.3.jar → ...swing-junit-1.2/lib/commons-codec-1.3.jar
View file
File renamed without changes.
0 ...ing-junit-1.2/lib/junit-4.3.1-sources.jar → ...ing-junit-1.2/lib/junit-4.3.1-sources.jar
View file
File renamed without changes.
0 .../fest-swing-junit-1.2/lib/junit-4.3.1.jar → .../fest-swing-junit-1.2/lib/junit-4.3.1.jar
View file
File renamed without changes.
0 ...nsions/junit/fest-swing-junit-1.2/pom.xml → ...nsions/junit/fest-swing-junit-1.2/pom.xml
View file
File renamed without changes.
0 ...it/fest-swing-junit-4.3.1-1.2/LICENSE.txt → ...it/fest-swing-junit-4.3.1-1.2/LICENSE.txt
View file
File renamed without changes.
0 ....2/fest-swing-junit-4.3.1-1.2-sources.jar → ....2/fest-swing-junit-4.3.1-1.2-sources.jar
View file
File renamed without changes.
0 ...-4.3.1-1.2/fest-swing-junit-4.3.1-1.2.jar → ...-4.3.1-1.2/fest-swing-junit-4.3.1-1.2.jar
View file
File renamed without changes.
0 .../junit/fest-swing-junit-4.3.1-1.2/pom.xml → .../junit/fest-swing-junit-4.3.1-1.2/pom.xml
View file
File renamed without changes.
0 ...unit/fest-swing-junit-4.5-1.2/LICENSE.txt → ...unit/fest-swing-junit-4.5-1.2/LICENSE.txt
View file
File renamed without changes.
0 ...-1.2/fest-swing-junit-4.5-1.2-sources.jar → ...-1.2/fest-swing-junit-4.5-1.2-sources.jar
View file
File renamed without changes.
0 ...unit-4.5-1.2/fest-swing-junit-4.5-1.2.jar → ...unit-4.5-1.2/fest-swing-junit-4.5-1.2.jar
View file
File renamed without changes.
0 ...g-junit-4.5-1.2/lib/junit-4.5-sources.jar → ...g-junit-4.5-1.2/lib/junit-4.5-sources.jar
View file
File renamed without changes.
0 ...est-swing-junit-4.5-1.2/lib/junit-4.5.jar → ...est-swing-junit-4.5-1.2/lib/junit-4.5.jar
View file
File renamed without changes.
0 ...ns/junit/fest-swing-junit-4.5-1.2/pom.xml → ...ns/junit/fest-swing-junit-4.5-1.2/pom.xml
View file
File renamed without changes.
0 .../testng/fest-swing-testng-1.2/LICENSE.txt → .../testng/fest-swing-testng-1.2/LICENSE.txt
View file
File renamed without changes.
0 ...tng-1.2/fest-swing-testng-1.2-sources.jar → ...tng-1.2/fest-swing-testng-1.2-sources.jar
View file
File renamed without changes.
0 ...wing-testng-1.2/fest-swing-testng-1.2.jar → ...wing-testng-1.2/fest-swing-testng-1.2.jar
View file
File renamed without changes.
0 ...swing-testng-1.2/lib/testng-5.7-jdk15.jar → ...swing-testng-1.2/lib/testng-5.7-jdk15.jar
View file
File renamed without changes.
0 ...ing-testng-1.2/lib/testng-5.7-sources.jar → ...ing-testng-1.2/lib/testng-5.7-sources.jar
View file
File renamed without changes.
0 ...ions/testng/fest-swing-testng-1.2/pom.xml → ...ions/testng/fest-swing-testng-1.2/pom.xml
View file
File renamed without changes.
0 ...fest-swing-1.2/fest-swing-1.2-sources.jar → ...fest-swing-1.2/fest-swing-1.2-sources.jar
View file
File renamed without changes.
0 deps_old/fest-swing-1.2/fest-swing-1.2.jar → deps_tests/fest-swing-1.2/fest-swing-1.2.jar
View file
File renamed without changes.
0 ...swing-1.2/lib/fest-assert-1.2-sources.jar → ...swing-1.2/lib/fest-assert-1.2-sources.jar
View file
File renamed without changes.
0 ...ld/fest-swing-1.2/lib/fest-assert-1.2.jar → ...ts/fest-swing-1.2/lib/fest-assert-1.2.jar
View file
File renamed without changes.
0 ...wing-1.2/lib/fest-reflect-1.2-sources.jar → ...wing-1.2/lib/fest-reflect-1.2-sources.jar
View file
File renamed without changes.
0 ...d/fest-swing-1.2/lib/fest-reflect-1.2.jar → ...s/fest-swing-1.2/lib/fest-reflect-1.2.jar
View file
File renamed without changes.
0 ...swing-1.2/lib/fest-util-1.1.2-sources.jar → ...swing-1.2/lib/fest-util-1.1.2-sources.jar
View file
File renamed without changes.
0 ...ld/fest-swing-1.2/lib/fest-util-1.1.2.jar → ...ts/fest-swing-1.2/lib/fest-util-1.1.2.jar
View file
File renamed without changes.
0 ...-1.2/lib/jcip-annotations-1.0-sources.jar → ...-1.2/lib/jcip-annotations-1.0-sources.jar
View file
File renamed without changes.
0 ...st-swing-1.2/lib/jcip-annotations-1.0.jar → ...st-swing-1.2/lib/jcip-annotations-1.0.jar
View file
File renamed without changes.
0 deps_old/fest-swing-1.2/pom.xml → deps_tests/fest-swing-1.2/pom.xml
View file
File renamed without changes.
Binary file modified doc/plantuml.jar
View file
Binary file not shown.
Binary file modified excel/tournament.xls
View file
Binary file not shown.
Binary file added excel/tournament_tmp.xls
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions nbproject/private/private.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
compile.on.save=false
do.depend=false
do.jar=true
file.reference.ant.jar=C:\\Perso\\tourma\\deps\\ant.jar
file.reference.jaxen.jar=C:\\Perso\\tourma\\libs\\jaxen-1.1.6.jar
file.reference.xalan.jar=C:\\Perso\\tourma\\deps\\xalan.jar
file.reference.xerces.jar=C:\\Perso\\tourma\\deps_old\\jdom\\lib\\xerces.jar
file.reference.xml-apis.jar=C:\\Perso\\tourma\\libs\\xml-apis.jar
javac.debug=true
javadoc.preview=true
user.properties.file=C:\\Users\\WFMJ7631\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
Loading

0 comments on commit eaba5f4

Please sign in to comment.