harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r804318 - in /harmony/enhanced/classlib/trunk: make/ modules/awt/ modules/awt/make/ modules/awt/src/main/native/gl/windows/ modules/awt/src/main/native/jpegdecoder/windows/ modules/awt/src/main/native/lcmm/windows/ modules/imageio/ modules/...
Date Fri, 14 Aug 2009 18:23:39 GMT
Author: hindessm
Date: Fri Aug 14 18:23:39 2009
New Revision: 804318

URL: http://svn.apache.org/viewvc?rev=804318&view=rev
Log:
Second attempt to upgrade lcms to v1.18 and png to v1.2.38 on windows/x86.
Fixed the makefile variables so they at least use the version variable now.
I will tidy these up a bit more shortly.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Fri Aug 14 18:23:39 2009
@@ -572,6 +572,7 @@
     <macrodef name="make">
         <attribute name="dir" />
         <attribute name="target" default="" />
+        <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
             <exec failonerror="true"
@@ -591,6 +592,7 @@
                 <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
+                <make-elements />
             </exec>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Fri Aug 14 18:23:39 2009
@@ -246,7 +246,12 @@
         depends="-build-native-common,-build-native-unix,-build-native-windows" />
         
     <target name="-build-native-common">
-        <make dir="src/main/native/lcmm/${hy.os.family}" />
+        <make dir="src/main/native/lcmm/${hy.os.family}">
+            <make-elements>
+                <env key="HY_LCMS_VER" value="${lcms.ver}" />
+            </make-elements>
+        </make>
+
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/lcmm">
@@ -262,7 +267,11 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/jpegdecoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegdecoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/jpegdecoder">
@@ -278,7 +287,12 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/gl/${hy.os.family}" />
+        <make dir="src/main/native/gl/${hy.os.family}">
+            <make-elements>
+                <env key="HY_PNG_VER" value="${png.ver}" />
+            </make-elements>
+        </make>
+
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/gl">

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties Fri Aug 14 18:23:39
2009
@@ -30,18 +30,20 @@
 jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
 jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
 
-lcms.ver=1.15
+lcms.ver@x86@=1.18
+lcms.ver@x86_64@=1.15
 lcms.dir=${depends.lib.dir}/lcms-${lcms.ver}
 lcms.testfile=${lcms.dir}/lcms.h
 lcms.tar=${depends.lib.dir}/lcms-${lcms.ver}.tar.gz
 lcms.url=${awt.base}/lcms-${lcms.ver}.tar.gz
-lcms.md5@x86@=e66de19d497ffe66e6d50f75c95e683e
+lcms.md5@x86@=85cf182f4bf93c9fabe0ddd9fc396a8a
 lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
 
-png.ver=1.2.12
+png.ver@x86@=1.2.38
+png.ver@x86_64@=1.2.12
 png.dir=${depends.lib.dir}/png-${png.ver}
 png.testfile=${png.dir}/png.h
 png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
 png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
 png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Fri Aug
14 18:23:39 2009
@@ -16,7 +16,7 @@
 APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=gl
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
Fri Aug 14 18:23:39 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegdecoder
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Fri
Aug 14 18:23:39 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-1.15\# avoid continuation
+LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-$(HY_LCMS_VER)\# avoid continuation
 
 LIBBASE=lcmm
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Fri Aug 14 18:23:39 2009
@@ -146,7 +146,11 @@
     
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="src/main/native/jpegencoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegencoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/jpegencoder/">
@@ -162,7 +166,11 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/pngencoder/${hy.os.family}" />
+        <make dir="src/main/native/pngencoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_PNG_VER" value="${png.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/pngencoder/">

Modified: harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties Fri Aug 14 18:23:39
2009
@@ -24,10 +24,11 @@
 jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
 jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
 
-png.ver=1.2.12
+png.ver@x86@=1.2.38
+png.ver@x86_64@=1.2.12
 png.dir=${depends.lib.dir}/png-${png.ver}
 png.testfile=${png.dir}/png.h
 png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
 png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
 png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
Fri Aug 14 18:23:39 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegencoder
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=804318&r1=804317&r2=804318&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
Fri Aug 14 18:23:39 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=pngencoder
 DLLNAME=..\$(LIBBASE).dll



Mime
View raw message