harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r801941 - in /harmony/enhanced/classlib/trunk: make/ modules/awt/src/main/native/gl/windows/ modules/awt/src/main/native/jpegdecoder/windows/ modules/awt/src/main/native/lcmm/windows/ modules/imageio/src/main/native/jpegencoder/windows/ mod...
Date Fri, 07 Aug 2009 10:41:07 GMT
Author: hindessm
Date: Fri Aug  7 10:41:06 2009
New Revision: 801941

URL: http://svn.apache.org/viewvc?rev=801941&view=rev
Log:
Split awt dependencies to make it simpler to upgrade them and unify
download locations.  (I didn't really like the downloads pointing to
accounts of inactive members of the project.)

Modified:
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml
    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/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=801941&r1=801940&r2=801941&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Fri Aug  7 10:41:06 2009
@@ -78,19 +78,31 @@
 servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
 servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
-awtdeps.extract.dir=${depends.dir}/libs/build
-awtdeps.dir=${depends.dir}/libs/${hy.platform}
-awtdeps.base@x86@=http://people.apache.org/~geirm/harmony/
-awtdeps.tar@x86@=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.url@x86@=${awtdeps.base@x86@}swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.md5@x86@=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.testfile@x86@=${awtdeps.extract.dir}/winxp_2006-09-28.txt
-
-awtdeps.base@x86_64@=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.tar@x86_64@=${awtdeps.dir}/swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.url@x86_64@=${awtdeps.base@x86_64@}swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.md5@x86_64@=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.testfile@x86_64@=${awtdeps.extract.dir}/win64_2007-02-08.txt
+depends.lib.dir=${depends.dir}/libs/${hy.platform}
+awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
+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
+
+lcms.ver=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_64@=e23282246ba9e1cf8b32c52d7fe97c78
+
+png.ver=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_64@=b562d8042aeb71d877cfd10518d019bc
 
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=801941&r1=801940&r2=801941&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Fri Aug  7 10:41:06 2009
@@ -46,18 +46,45 @@
         <check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
   
     </target>
 
-    <target name="-check-win" if="is.windows" depends="-really-check-win" />
+    <target name="-check-win" if="is.windows"
+            depends="-really-check-win,-win-props,-ext-jpeg,-ext-lcms,-ext-png" />
 
     <target name="-really-check-win" if="is.windows">
         <property environment="hyenv" />
 
         <check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
         <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
-        <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
-        <uptodate property="awtdeps.uptodate"
-                  srcfile="${awtdeps.tar}"
-                  targetfile="${awtdeps.testfile}" />
-        <antcall target="-awt-tar-extract" />
+        <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
+        <check-one-file src="${lcms.url}" dest="${lcms.tar}" />
+        <check-one-file src="${png.url}" dest="${png.tar}" />
+    </target>
+
+    <target name="-win-props" if="is.windows">
+        <uptodate property="jpeg.uptodate"
+                  srcfile="${jpeg.tar}"
+                  targetfile="${jpeg.testfile}" />
+        <uptodate property="lcms.uptodate"
+                  srcfile="${lcms.tar}"
+                  targetfile="${lcms.testfile}" />
+        <uptodate property="png.uptodate"
+                  srcfile="${png.tar}"
+                  targetfile="${png.testfile}" />
+    </target>
+
+    <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
+        <echo>Extracting jpeg dependencies</echo>
+        <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
+	<touch file="${jpeg.testfile}" />
+    </target>
+    <target name="-ext-lcms" if="is.windows" unless="lcms.uptodate">
+        <echo>Extracting lcms dependencies</echo>
+        <untar src="${lcms.tar}" dest="${depends.lib.dir}" compression="gzip" />
+	<touch file="${lcms.testfile}" />
+    </target>
+    <target name="-ext-png" if="is.windows" unless="png.uptodate">
+        <echo>Extracting png dependencies</echo>
+        <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
+	<touch file="${png.testfile}" />
     </target>
 
     <target name="-extract"
@@ -127,65 +154,74 @@
 
     <target name="-download">
 
-    <mkdir dir="${xalan.dir}" />
-    <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
+        <mkdir dir="${xalan.dir}" />
+        <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
                            md5="${xalan.md5}" />
 
-    <mkdir dir="${xerces.dir}" />
-    <download-one-file src="${xerces.url}" dest="${xerces.zip}"
+        <mkdir dir="${xerces.dir}" />
+        <download-one-file src="${xerces.url}" dest="${xerces.zip}"
                            md5="${xerces.md5}" />
 
-    <mkdir dir="${junit.dir}" />
-    <download-one-file src="${junit.url}" dest="${junit.jar}"
+        <mkdir dir="${junit.dir}" />
+        <download-one-file src="${junit.url}" dest="${junit.jar}"
                            md5="${junit.md5}" />
 
-    <mkdir dir="${hamcrest-library.dir}" />
-    <download-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}"
+        <mkdir dir="${hamcrest-library.dir}" />
+        <download-one-file src="${hamcrest-library.url}"
+                           dest="${hamcrest-library.jar}"
                            md5="${hamcrest-library.md5}" />
 
-    <mkdir dir="${bcprov.dir}" />
-    <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
+        <mkdir dir="${bcprov.dir}" />
+        <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
                            md5="${bcprov.md5}" />
 
-    <mkdir dir="${jetty.dir}" />
-    <download-one-file src="${jetty.url}" dest="${jetty.jar}"
+        <mkdir dir="${jetty.dir}" />
+        <download-one-file src="${jetty.url}" dest="${jetty.jar}"
                            md5="${jetty.md5}" />
  
-    <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
+        <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
                            md5="${jetty-util.md5}" />
-                           
+
         <download-one-file src="${servlet-api.url}" dest="${servlet-api.jar}"
                            md5="${servlet-api.md5}" />
-                           
-    <mkdir dir="${icu4j.dir}" />
-    <download-one-file src="${icu4j.url}"
-                       dest="${icu4j.jar}"
-                       md5="${icu4j.md5}" />
-    <download-one-file src="${icu4j-charsets.url}"
-                       dest="${icu4j-charsets.jar}"
-                       md5="${icu4j-charsets.md5}" />
+
+        <mkdir dir="${icu4j.dir}" />
+        <download-one-file src="${icu4j.url}"
+                           dest="${icu4j.jar}"
+                           md5="${icu4j.md5}" />
+        <download-one-file src="${icu4j-charsets.url}"
+                           dest="${icu4j-charsets.jar}"
+                           md5="${icu4j-charsets.md5}" />
     </target>
 
     <target name="-download-win" if="is.windows">
 
-    <property environment="hyenv" />
+        <property environment="hyenv" />
 
-    <mkdir dir="${msvcr.dir}" />
-    <download-one-file src="${msvcr.url}"
-                       dest="${msvcr.dll}"
-                       md5="${msvcr.md5}"
-                       md5-deprecated="${msvcr.md5.deprecated}" />
-
-    <mkdir dir="${msvcp.dir}" />
-    <download-one-file src="${msvcp.url}"
-                       dest="${msvcp.dll}"
-                       md5="${msvcp.md5}"
-                       md5-deprecated="${msvcp.md5.deprecated}" />
-
-    <mkdir dir="${awtdeps.dir}" />
-    <download-one-file src="${awtdeps.url}"
-                       dest="${awtdeps.tar}"
-                       md5="${awtdeps.md5}" />
+        <mkdir dir="${msvcr.dir}" />
+        <download-one-file src="${msvcr.url}"
+                           dest="${msvcr.dll}"
+                           md5="${msvcr.md5}"
+                           md5-deprecated="${msvcr.md5.deprecated}" />
+
+        <mkdir dir="${msvcp.dir}" />
+        <download-one-file src="${msvcp.url}"
+                           dest="${msvcp.dll}"
+                           md5="${msvcp.md5}"
+                           md5-deprecated="${msvcp.md5.deprecated}" />
+
+        <mkdir dir="${jpeg.dir}" />
+        <download-one-file src="${jpeg.url}"
+                           dest="${jpeg.tar}"
+                           md5="${jpeg.md5}" />
+        <mkdir dir="${lcms.dir}" />
+        <download-one-file src="${lcms.url}"
+                           dest="${lcms.tar}"
+                           md5="${lcms.md5}" />
+        <mkdir dir="${png.dir}" />
+        <download-one-file src="${png.url}"
+                           dest="${png.tar}"
+                           md5="${png.md5}" />
     </target>
 
 </project>

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=801941&r1=801940&r2=801941&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
 7 10:41:06 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\build\png\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# 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=801941&r1=801940&r2=801941&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  7 10:41:06 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# 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=801941&r1=801940&r2=801941&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  7 10:41:06 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-LCMS_DIR=$(HY_HDK)\..\depends\libs\build\lcms\# comment to avoid continuation
+LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-1.15\# avoid continuation
 
 LIBBASE=lcmm
 DLLNAME=..\$(LIBBASE).dll
@@ -35,7 +35,7 @@
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms114$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 COMMENT=/comment:"LCMM Wrapper native code. (c) Copyright 2005, 2007 The Apache Software
Foundation or its licensors, as applicable."

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=801941&r1=801940&r2=801941&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  7 10:41:06 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# 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=801941&r1=801940&r2=801941&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  7 10:41:06 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\build\png\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
 
 LIBBASE=pngencoder
 DLLNAME=..\$(LIBBASE).dll



Mime
View raw message