harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r467910 - in /incubator/harmony/enhanced/classlib/trunk: depends/libs/build/ make/ modules/awt/src/main/native/gl/linux/ modules/awt/src/main/native/jpegdecoder/linux/ modules/awt/src/main/native/lcmm/linux/ modules/imageio/src/main/native/...
Date Thu, 26 Oct 2006 08:24:33 GMT
Author: hindessm
Date: Thu Oct 26 01:24:32 2006
New Revision: 467910

URL: http://svn.apache.org/viewvc?view=rev&rev=467910
Log:
Convert awt dependencies to use harmony platform for file extensions.
To fix your tree, try:
  for f in depends/libs/build/*/*.ia32 ;do mv $f ${f%.ia32}.linux.x86;done
  for f in depends/libs/build/*/*.ipf ;do mv $f ${f%.ipf}.linux.x86_64;done

Modified:
    incubator/harmony/enhanced/classlib/trunk/depends/libs/build/README.txt
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/depends/libs/build/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/depends/libs/build/README.txt?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/libs/build/README.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/libs/build/README.txt Thu Oct 26 01:24:32
2006
@@ -37,17 +37,19 @@
        |    +--- jerror.h
        |    +--- jpegint.h
        |    +--- jconfig.lnx and/or jconfig.vc
-       |    +--- libjpeg.lib and/or libjpeg.ia32 and/or libjpeg.ipf
+       |    +--- libjpeg.lib and/or libjpeg.linux.x86 and/or
+       |         libjpeg.linux.x86_64
        \---png
        |    |
        |    +--- png.h
        |    +--- pngconf.h
-       |    +--- libpng.lib and/or libpng.ia32 and/or libpng.ipf
+       |    +--- libpng.lib and/or libpng.linux.x86 and/or libpng.linux.x86_64
        \---lcms
        |    |
        |    +--- icc34.h
        |    +--- lcms.h
-       |    +--- lcms114.lib and/or liblcms.ia32 and/or liblcms.ipf
+       |    +--- lcms114.lib and/or liblcms.linux.x86 and/or
+       |         liblcms.linux.x86_64
        ...
 
 NOTE: The tree above indicates the files required for this contribution,
@@ -96,7 +98,7 @@
 	    make
 
     5. Copy the resulting libjpeg.a file to the file
-       <EXTERNAL_LIBS_DIR>/jpeg/libjpeg.ia32.
+       <EXTERNAL_LIBS_DIR>/jpeg/libjpeg.linux.x86.
 
     6. Copy the required header files to the <EXTERNAL_LIBS_DIR>/jpeg
        directory.
@@ -143,7 +145,7 @@
    	   make
 
    4. Copy the resulting ./.libs/libpng.a file the following file
-      <EXTERNAL_LIBS_DIR>/png/libpng.ia32
+      <EXTERNAL_LIBS_DIR>/png/libpng.linux.x86
 
    5. Copy the files png.h and pngconf.h to the
       <EXTERNAL_LIBS_DIR>/png directory.
@@ -187,7 +189,7 @@
    	make
 
    4. Copy the file ./src/.libs/liblcms.a to the following file
-      <EXTERNAL_LIBS_DIR>/lcms/liblcms.ia32
+      <EXTERNAL_LIBS_DIR>/lcms/liblcms.linux.x86
 
    5. Copy the files ./include/icc34.h and ./include/lcms.h
       to the <EXTERNAL_LIBS_DIR>/lcms directory.

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Oct 26 01:24:32 2006
@@ -85,11 +85,6 @@
 
     <target name="-check-unix" if="is.unix">
         
-        <condition property="hack.arch" value="ipf">
-            <isset property="is.x86_64" />
-        </condition>
-        <property name="hack.arch" value="ia32" />
-
         <property name="lcms.msg"
                   value="liblcms development package not installed
 ${line.separator}See depends/libs/build/README.txt for further details.
@@ -97,7 +92,7 @@
 ${line.separator}For Fedora try: yum install lcms-devel" />
         <mkdir dir="depends/libs/build/lcms" />
         <check-one-link src="${lcms.home}/lib/liblcms.a"
-                        dest="depends/libs/build/lcms/liblcms.${hack.arch}"
+                        dest="depends/libs/build/lcms/liblcms.${hy.platform}"
                         message="${lcms.msg}" />
         <check-one-link src="${lcms.home}/include/icc34.h"
                         dest="depends/libs/build/lcms/icc34.h"
@@ -114,7 +109,7 @@
 ${line.separator}For Fedora try: yum install libpng-devel" />
         <mkdir dir="depends/libs/build/png" />
         <check-one-link src="${png.home}/lib/libpng.a"
-                        dest="depends/libs/build/png/libpng.${hack.arch}"
+                        dest="depends/libs/build/png/libpng.${hy.platform}"
                         message="${png.msg}" />
         <check-one-link src="${png.home}/include/pngconf.h"
                         dest="depends/libs/build/png/pngconf.h"
@@ -131,7 +126,7 @@
 ${line.separator}For Fedora try: yum install libjpeg-devel" />
         <mkdir dir="depends/libs/build/jpeg" />
         <check-one-link src="${jpeg.home}/lib/libjpeg.a"
-                        dest="depends/libs/build/jpeg/libjpeg.${hack.arch}"
+                        dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
                         message="${jpeg.msg}" />
         <check-one-link src="${jpeg.home}/include/jconfig.h"
                         dest="depends/libs/build/jpeg/jconfig.lnx"

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Thu Oct 26 01:24:32 2006
@@ -269,6 +269,8 @@
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
                 <env key="HY_ARCH" value="${hy.arch}" />
+                <env key="HY_OS" value="${hy.os}" />
+                <env key="HY_PLATFORM" value="${hy.platform}" />
                 <env key="HY_CFLAGS" value="${hy.cflags}" />
                 <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
                 <arg line="@{target}" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
Thu Oct 26 01:24:32 2006
@@ -37,5 +37,5 @@
 
 include $(HY_HDK)/build/make/rules.mk
 
-libpng.a: $(PNG_DIR)/libpng.ia32
+libpng.a: $(PNG_DIR)/libpng.$(HY_PLATFORM)
 	cp $< $@

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
Thu Oct 26 01:24:32 2006
@@ -36,5 +36,5 @@
 jconfig.h: $(JPEG_DIR)jconfig.lnx
 	cp $< $@
 
-libjpeg.a: $(JPEG_DIR)libjpeg.ia32
+libjpeg.a: $(JPEG_DIR)libjpeg.$(HY_PLATFORM)
 	cp $< $@

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
Thu Oct 26 01:24:32 2006
@@ -35,5 +35,5 @@
 
 include $(HY_HDK)/build/make/rules.mk
 
-liblcms.a: $(LCMS_DIR)/liblcms.ia32
+liblcms.a: $(LCMS_DIR)/liblcms.$(HY_PLATFORM)
 	cp $< $@

Modified: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile?view=diff&rev=467910&r1=467909&r2=467910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
Thu Oct 26 01:24:32 2006
@@ -36,6 +36,6 @@
 jconfig.h: $(JPEG_DIR)jconfig.lnx
 	cp $< $@
 
-libjpeg.a: $(JPEG_DIR)libjpeg.ia32
+libjpeg.a: $(JPEG_DIR)libjpeg.$(HY_PLATFORM)
 	cp $< $@
 



Mime
View raw message