Tamino/Siba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Tamino:master
Branches Tags
Tamino:master
Tamino:cpm-antbuild
Tamino:cpm-helpmessage
Tamino:0.0.2
..
compare: Tamino:cpm-antbuild
Branches Tags
Tamino:master
Tamino:cpm-antbuild
Tamino:cpm-helpmessage
Tamino:0.0.2

No commits in common. "master" and "cpm-antbuild" have entirely different histories.
master ... cpm-antbui

13 changed files with 11 additions and 104 deletions
Show Stats Expand all files Collapse all files

4
build.num
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Mon Sep 05 18:27:48 CEST 2016
build.number=3
#Mon Sep 05 12:43:48 CEST 2016
build.number=1

93
build_save.xml
View File

@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- WARNING: Eclipse auto-generated file.
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
as the first entry and export the buildfile again. --><project basedir="." default="build" name="Siba">
<property environment="env"/>
<property name="ECLIPSE_HOME" value="../../Bin/eclipse-mars_sav/"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.8"/>
<property name="source" value="1.8"/>
<path id="Siba.classpath">
<pathelement location="bin"/>
<pathelement location="lib/commons-compress-1.10.jar"/>
<pathelement location="lib/jgoodies-forms-1.8.0.jar"/>
<pathelement location="lib/jgoodies-common-1.8.1.jar"/>
<pathelement location="lib/commons-compress-1.10-sources.jar"/>
<pathelement location="lib/commons-lang3-3.4.jar"/>
<pathelement location="lib/commons-lang3-3.4-javadoc.jar"/>
<pathelement location="lib/commons-io-2.5.jar"/>
<pathelement location="lib/UnitTesting/jcommander-1.48.jar"/>
<pathelement location="lib/UnitTesting/testng-6.9.10.jar"/>
<pathelement location="lib/Logs/log4j-1.2.17.jar"/>
<pathelement location="lib/Logs/slf4j-api-1.7.21.jar"/>
<pathelement location="lib/Logs/slf4j-log4j12-1.7.21.jar"/>
<pathelement location="lib/commons-io-2.5-src.jar"/>
<pathelement location="lib/commons-lang3-3.4-src.jar"/>
<pathelement location="lib/jgoodies-forms-1.8.0-sources.jar"/>
</path>
<target name="init">
<mkdir dir="bin"/>
<copy includeemptydirs="false" todir="bin">
<fileset dir="src">
<exclude name="**/*.launch"/>
<exclude name="**/*.java"/>
</fileset>
</copy>
<copy includeemptydirs="false" todir="bin">
<fileset dir="test">
<exclude name="**/*.launch"/>
<exclude name="**/*.java"/>
</fileset>
</copy>
</target>
<target name="clean">
<delete dir="bin"/>
</target>
<target depends="clean" name="cleanall"/>
<target depends="build-subprojects,build-project" name="build"/>
<target name="build-subprojects"/>
<target depends="init" name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
<src path="src"/>
<src path="test"/>
<classpath refid="Siba.classpath"/>
</javac>
</target>
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
<target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
<copy todir="${ant.library.dir}">
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
</copy>
<unzip dest="${ant.library.dir}">
<patternset includes="jdtCompilerAdapter.jar"/>
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
</unzip>
</target>
<target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<antcall target="build"/>
</target>
<target name="SibaLauncher">
<java classname="Siba.SibaLauncher" failonerror="true" fork="yes">
<classpath refid="Siba.classpath"/>
</java>
</target>
<target name="SibaCLI">
<java classname="org.dclermonte.siba.cli.SibaCLI" failonerror="true" fork="yes">
<classpath refid="Siba.classpath"/>
</java>
</target>
<target name="SibaGUI">
<java classname="org.dclermonte.siba.gui.SibaGUI" failonerror="true" fork="yes">
<classpath refid="Siba.classpath"/>
</java>
</target>
<target name="Siba">
<java classname="org.dclermonte.siba.Siba" failonerror="true" fork="yes">
<classpath refid="Siba.classpath"/>
</java>
</target>
</project>

2
buildandgit.xml
View File

@ -4,7 +4,7 @@
<import file="build.xml" />
<!-- ***** Dist ***** -->
<target name="buildandgit" depends="dist, clean">
<target name="buildandgit" depends="dist">
<!-- GIT actions-->
<echo message="Commit build.num"/>
<exec executable="git" outputproperty="git.commit.out" failifexecutionfails="true">

BIN
lib/Siba.jar
View File

Binary file not shown.

2
src/org/dclermonte/siba/gui/messages_fr_FR.properties
View File

@ -15,7 +15,7 @@ CheckPanel.btnNewButton.text=\u2026
CheckPanel.btnNewButton_1.text=Vérifier
CheckPanel.lblNewLabel.text=Sauvegarde \u00E0 v\u00E9rifier :
SibaGUI.mnNewMenu.text=Aide
SibaGUI.mntmNewMenuItem_2.text=\u00C0 propos
SibaGUI.mntmNewMenuItem_2.text=A propos
SourceDirectorySelector.this.dialogTitle=Choix du répertoire à sauvegarder
TargetDirectorySelector.this.dialogTitle=Choix du répertoire de destination
BackupPanel.checkFileChooserButton.text= Fichier à vérifier

2
src/org/dclermonte/siba/util/BuildInformation.java
View File

@ -63,7 +63,7 @@ public class BuildInformation
}
//
this.productName = build.getProperty("product.name", "DevInProgress");
this.productName = build.getProperty("product.name", "PuckInstaller");
this.majorRevision = build.getProperty("product.revision.major", "d");
this.minorRevision = build.getProperty("product.revision.minor", "e");
this.buildNumber = build.getProperty("product.revision.build", "v");

0
test/org/dclermonte/siba/data/result/simplestuff-2016-08-31T11h21mn36s.tgz → test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz
View File

1
test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz.md5 Normal file
View File

@ -0,0 +1 @@
0cdb449c8a62adc04d7ac0a095b2a247 simplestuff-2016-08-30T22h44mn21s.tgz

BIN
test/org/dclermonte/siba/data/reference/simplestuff-2016-09-13T17h03mn16s.tgz
View File

Binary file not shown.

1
test/org/dclermonte/siba/data/reference/simplestuff-2016-09-13T17h03mn16s.tgz.md5
View File

@ -1 +0,0 @@
4ccf182439024ca07874281864724ffc simplestuff-2016-09-13T17h03mn16s.tgz

1
test/org/dclermonte/siba/data/result/fileMD5
View File

@ -1 +0,0 @@
2ca82150296f8412afd282e0d412ddea simplestuff-2016-08-30T19h34mn35s.tgz

1
test/org/dclermonte/siba/data/result/simplestuff-2016-08-31T11h21mn36s.tgz.md5
View File

@ -1 +0,0 @@
0cdb449c8a62adc04d7ac0a095b2a247 simplestuff-2016-08-31T11h21mn36s.tgz

8
test/org/dclermonte/siba/model/SibaManagerTest.java
View File

@ -56,11 +56,13 @@ public class SibaManagerTest
File source = new File("test/org/dclermonte/siba/data/simplestuff");
File target = SibaManager.backup(source, new File(System.getProperty("java.io.tmpdir")));
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-09-13T17h03mn16s.tgz");
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz");
Boolean fileEquals = FileUtils.contentEquals(reference, target);
File targetMD5 = new File(target.getAbsolutePath() + ".md5");
target.delete();
targetMD5.delete();
// Test.
Assert.assertTrue(fileEquals);
}
@ -80,11 +82,11 @@ public class SibaManagerTest
@Test
public void backupTest03() throws ArchiveException, IOException, SibaException, NoSuchAlgorithmException
{
File source = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-09-13T17h03mn16s.tgz");
File source = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz");
String md5Calculate = SibaUtils.md5(source);
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-09-13T17h03mn16s.tgz.md5");
File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz.md5");
String md5Reference = SibaUtils.loadMD5Sum(reference);
// Test.