harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939487 - in /harmony/enhanced/java/trunk/classlib/modules: awt/make/ awt/src/main/native/gl/windows/ awt/src/main/native/lcmm/windows/ imageio/make/ imageio/src/main/native/pngencoder/windows/
Date Thu, 29 Apr 2010 21:35:30 GMT
Author: hindessm
Date: Thu Apr 29 21:35:30 2010
New Revision: 939487

URL: http://svn.apache.org/viewvc?rev=939487&view=rev
Log:
Updating awt dependencies (both x86 and x86_64).

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

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/make/depends.properties?rev=939487&r1=939486&r2=939487&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/make/depends.properties Thu Apr 29 21:35:30
2010
@@ -25,25 +25,23 @@ awt.base=http://people.apache.org/~hinde
 jpeg.ver=6b
 jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
 jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
 
-lcms.ver@x86@=1.18
-lcms.ver@x86_64@=1.15
+lcms.ver=1.19
 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@=85cf182f4bf93c9fabe0ddd9fc396a8a
-lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
+lcms.testfile=${lcms.dir}/include/lcms.h
+lcms.tar=${depends.lib.dir}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.url=${awt.base}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.md5@x86@=48e8ce8481fcebdbb31cdebac38a0c05
+lcms.md5@x86_64@=d7dfc53649e352877e3eb6daad12c290
 
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${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@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=939487&r1=939486&r2=939487&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile Thu
Apr 29 21:35:30 2010
@@ -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-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=gl
 DLLNAME=$(DLLPATH)$(LIBBASE).dll

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=939487&r1=939486&r2=939487&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
Thu Apr 29 21:35:30 2010
@@ -22,7 +22,7 @@ DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR)include /I$(SHAREDSUB)include
 
 BUILDFILES = \
   $(SHAREDSUB)cmmerror.obj \
@@ -35,7 +35,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties?rev=939487&r1=939486&r2=939487&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties Thu Apr 29
21:35:30 2010
@@ -19,16 +19,15 @@ awt.base=http://people.apache.org/~hinde
 jpeg.ver=6b
 jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
 jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
 
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${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@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=939487&r1=939486&r2=939487&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
Thu Apr 29 21:35:30 2010
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=pngencoder
 DLLNAME=$(DLLPATH)$(LIBBASE).dll



Mime
View raw message