You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/05/18 12:40:58 UTC
svn commit: r945584 - in /harmony/enhanced/java/trunk/classlib/modules: awt/
awt/src/main/native/gl/windows/ awt/src/main/native/jpegdecoder/windows/
awt/src/main/native/lcmm/windows/ imageio/
imageio/src/main/native/jpegencoder/windows/ imageio/src/ma...
Author: hindessm
Date: Tue May 18 10:40:58 2010
New Revision: 945584
URL: http://svn.apache.org/viewvc?rev=945584&view=rev
Log:
Fixing awt dependencies build break.
Modified:
harmony/enhanced/java/trunk/classlib/modules/awt/build.xml
harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/gl/windows/makefile
harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/lcmm/windows/makefile
harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml
harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
Modified: harmony/enhanced/java/trunk/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/build.xml?rev=945584&r1=945583&r2=945584&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/build.xml Tue May 18 10:40:58 2010
@@ -229,19 +229,22 @@ ${line.separator}For Fedora try: yum ins
<target name="-build-native-common" unless="skip.native.build">
<make dir="src/main/native/lcmm/${hy.os.family}">
<make-elements>
- <env key="HY_LCMS_VER" value="${lcms.ver}" />
+ <env key="HY_LCMS_DIR" value="${lcms.dir}" />
</make-elements>
</make>
+ <pathconvert targetos="windows" property="jpeg.dir.win">
+ <path location="${jpeg.dir}" />
+ </pathconvert>
<make dir="src/main/native/jpegdecoder/${hy.os.family}">
<make-elements>
- <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+ <env key="HY_JPEG_DIR" value="${jpeg.dir.win}" />
</make-elements>
</make>
<make dir="src/main/native/gl/${hy.os.family}">
<make-elements>
- <env key="HY_PNG_VER" value="${png.ver}" />
+ <env key="HY_PNG_DIR" value="${png.dir}" />
</make-elements>
</make>
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=945584&r1=945583&r2=945584&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 Tue May 18 10:40:58 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)\libpng-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_PNG_DIR)\# avoid continuation
LIBBASE=gl
DLLNAME=$(DLLPATH)$(LIBBASE).dll
Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=945584&r1=945583&r2=945584&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile Tue May 18 10:40:58 2010
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
+JPEG_DIR=$(HY_JPEG_DIR)\# avoid continuation
LIBBASE=jpegdecoder
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=945584&r1=945583&r2=945584&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 Tue May 18 10:40:58 2010
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-$(HY_LCMS_VER)\# avoid continuation
+LCMS_DIR=$(HY_LCMS_DIR)\# avoid continuation
LIBBASE=lcmm
DLLNAME=$(DLLPATH)$(LIBBASE).dll
Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml?rev=945584&r1=945583&r2=945584&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml Tue May 18 10:40:58 2010
@@ -135,15 +135,18 @@ ${line.separator}For Fedora try: yum ins
</target>
<target name="-build-native" unless="skip.native.build">
+ <pathconvert targetos="windows" property="jpeg.dir.win">
+ <path location="${jpeg.dir}" />
+ </pathconvert>
<make dir="src/main/native/jpegencoder/${hy.os.family}">
<make-elements>
- <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+ <env key="HY_JPEG_DIR" value="${jpeg.dir.win}" />
</make-elements>
</make>
<make dir="src/main/native/pngencoder/${hy.os.family}">
<make-elements>
- <env key="HY_PNG_VER" value="${png.ver}" />
+ <env key="HY_PNG_DIR" value="${png.dir}" />
</make-elements>
</make>
</target>
Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=945584&r1=945583&r2=945584&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile Tue May 18 10:40:58 2010
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
+JPEG_DIR=$(HY_JPEG_DIR)\# avoid continuation
LIBBASE=jpegencoder
DLLNAME=$(DLLPATH)$(LIBBASE).dll
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=945584&r1=945583&r2=945584&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 Tue May 18 10:40:58 2010
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_PNG_DIR)\# avoid continuation
LIBBASE=pngencoder
DLLNAME=$(DLLPATH)$(LIBBASE).dll