Author: gmascellani-guest
Date: 2008-12-23 20:48:23 +0000 (Tue, 23 Dec 2008)
New Revision: 1819

Modified:
   packages/josm/trunk/debian/patches/10_build.dpatch
Log:
 * Debian release written in the jar's manifest file
 * Some little refactoring: some compiling stuff was in dist target


Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch  2008-12-23 20:46:27 UTC 
(rev 1818)
+++ packages/josm/trunk/debian/patches/10_build.dpatch  2008-12-23 20:48:23 UTC 
(rev 1819)
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml
---- josm-0.0.svn1137~/build.xml        2008-12-23 13:14:33.000000000 +0100
-+++ josm-0.0.svn1137/build.xml 2008-12-23 13:15:06.000000000 +0100
-@@ -1,39 +1,25 @@
+--- josm-0.0.svn1137~/build.xml        2008-12-23 21:20:01.000000000 +0100
++++ josm-0.0.svn1137/build.xml 2008-12-23 21:20:09.000000000 +0100
+@@ -1,39 +1,24 @@
  <project name="josm" default="dist" basedir=".">
  
 -      <!-- All jar files necessary to run only JOSM (no tests) -->
@@ -32,14 +32,14 @@
 -              <unjar dest="build">
 -                      <fileset refid="josm_required_libs" />
 -              </unjar>
- 
+-
 -              <!-- translation -->
 -              <unjar dest="build">
 -                      <fileset dir="lib">
 -                              <include name="josm-translation.jar" />
 -                      </fileset>
 -              </unjar>
--
+ 
 -              <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
 +              <!--<exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
                        <env key="LANG" value="C"/>
@@ -47,24 +47,26 @@
 -                      <arg value="--xml"/>
 +                      <arg value="-xml"/>
                        <arg value="."/>
-               </exec>
+-              </exec>
++              </exec>-->
                <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
 -              <delete file="REVISION"/>
-+              <delete file="REVISION"/>-->
 +              <property name="version.entry.commit.revision" value="UNKNOWN"/>
 +              <property name="version.entry.commit.date" value="UNKNOWN"/>
  
                <!-- images -->
                <copy todir="build/images">
-@@ -49,16 +35,18 @@
+@@ -49,16 +34,21 @@
                <copy file="README" todir="build"/>
                <copy file="LICENSE" todir="build"/>
  
-+              <ant target="build" dir="i18n"/>
++              <ant target="dist" dir="i18n"/>
 +
                  <!-- styles -->
                <copy file="styles/standard/elemstyles.xml" 
todir="build/styles/standard"/>
  
++              <property environment="env"/>
++
                <!-- create josm-custom.jar -->
 -              <delete file="dist/josm-custom.jar"/>
                <jar destfile="dist/josm-custom.jar" basedir="build">
@@ -72,11 +74,20 @@
                                <attribute name="Main-class" value="JOSM" />
                                <attribute name="Main-Version" 
value="${version.entry.commit.revision} SVN"/>
                                <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
++                              <attribute name="Debian-Release" 
value="${debian.version}"/>
 +                              <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar"/>
                        </manifest>
                </jar>
        </target>
-@@ -78,6 +66,7 @@
+@@ -68,6 +58,7 @@
+                               target="1.5" source="1.5" debug="on" 
encoding="UTF-8">
+                       <compilerarg value="-Xlint:deprecation"/>
+               </javac>
++              <ant target="build" dir="i18n"/>
+       </target>
+ 
+       <target name="init">
+@@ -78,6 +69,7 @@
        <target name="clean">
                <delete dir="build" />
                <delete dir="dist" />
@@ -85,22 +96,30 @@
  
  </project>
 diff -urNad josm-0.0.svn1137~/i18n/build.xml josm-0.0.svn1137/i18n/build.xml
---- josm-0.0.svn1137~/i18n/build.xml   2008-12-23 13:14:33.000000000 +0100
-+++ josm-0.0.svn1137/i18n/build.xml    2008-12-23 13:14:42.000000000 +0100
-@@ -41,7 +41,7 @@
+--- josm-0.0.svn1137~/i18n/build.xml   2008-12-23 21:20:01.000000000 +0100
++++ josm-0.0.svn1137/i18n/build.xml    2008-12-23 21:20:27.000000000 +0100
+@@ -41,7 +41,13 @@
      </exec>
    </target>
  
 -  <target name="build" depends="josm.pot">
-+  <target name="build">
++  <target name="build.check">
++    <condition property="build.run">
++      <not><available file="build-timestamp"/></not>
++    </condition>
++  </target>
++
++  <target name="build" depends="build.check" if="build.run">
      <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
  
      <ant target="build-lang"><property name="language" value="cs"/></ant>
-@@ -55,29 +55,33 @@
+@@ -55,29 +61,37 @@
      <ant target="build-lang"><property name="language" value="sl"/></ant>
      <ant target="build-lang"><property name="language" value="sv"/></ant>
  
 -    <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
++    <touch file="build-timestamp"/>
++
 +    <!--<exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
        <env key="LANG" value="C"/>
        <arg value="info"/>
@@ -121,13 +140,15 @@
        </manifest>
 -    </jar>
 +    </jar>-->
-+
+ 
+   </target>
+ 
++  <target name="dist" depends="build">
 +    <copy todir="../build">
 +      <fileset dir="build"/>
 +    </copy>
- 
-   </target>
- 
++  </target>
++
    <target name="build-lang">
 -    <exec executable="msgmerge">
 +    <!--<exec executable="msgmerge">
@@ -137,3 +158,11 @@
  
      <exec executable="msgfmt">
        <arg line="--verbose --java2 -dbuild 
-rorg.openstreetmap.josm.i18n.Translation -l${language} po/${language}.po"/>
+@@ -92,6 +106,7 @@
+     <delete file="wms.java"/>
+     <delete file="surveyor.java"/>
+     <delete file="java_sourcefiles.txt"/>
++    <delete file="build-timestamp"/>
+   </target>
+ 
+ </project>


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to