harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Oliver Deakin <oliver.dea...@googlemail.com>
Subject Re: [build] Windows build failure
Date Tue, 18 May 2010 08:36:18 GMT
On 18/05/2010 00:18, Mark Hindess wrote:
> In message<201005172226.o4HMQ4mb015018@d12av03.megacenter.de.ibm.com>,
> Mark Hindess writes:
>    
>> In message<4BF16FC9.5030200@googlemail.com>, Oliver Deakin writes:
>>      
>>> Looking at the compile lines, this include path doesn't look right:
>>>     /ID:\Harmony5\target\hdk\..\depends\libs\windows.x86\lcms-1.19\include
>>>
>>> I can see lcms.h in classlib\depends\libs\windows.x86\lcms-1.19\include
>>> but not anywhere under the target directory.
>>>        
>> Hmm... I'll take a look.  I think the awt build needs to pass the
>> dependencies directories explicitly rather than relying on a rather
>> fragile relationship between the depends directory and hdk directory.
>>      
> I've appended a patch below.  I'm testing it now.  I'd like a second
> committer to confirm that I can commit it please.
>    

That works for me - the classlib build completes with that patch 
applied. I'm +1 to applying it.

Regards,
Oli

> Regards,
> -Mark.
>
> Index: classlib/modules/awt/src/main/native/gl/windows/makefile
> ===================================================================
> --- classlib/modules/awt/src/main/native/gl/windows/makefile	(revision 945404)
> +++ classlib/modules/awt/src/main/native/gl/windows/makefile	(working copy)
> @@ -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
> Index: classlib/modules/awt/src/main/native/lcmm/windows/makefile
> ===================================================================
> --- classlib/modules/awt/src/main/native/lcmm/windows/makefile	(revision 945404)
> +++ classlib/modules/awt/src/main/native/lcmm/windows/makefile	(working copy)
> @@ -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
> Index: classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
> ===================================================================
> --- classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile	(revision 945404)
> +++ classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile	(working copy)
> @@ -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
> Index: classlib/modules/awt/build.xml
> ===================================================================
> --- classlib/modules/awt/build.xml	(revision 945404)
> +++ classlib/modules/awt/build.xml	(working copy)
> @@ -229,19 +229,22 @@
>       <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>
>
> Index: classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
> ===================================================================
> --- classlib/modules/imageio/src/main/native/pngencoder/windows/makefile	(revision 945404)
> +++ classlib/modules/imageio/src/main/native/pngencoder/windows/makefile	(working copy)
> @@ -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
> Index: classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
> ===================================================================
> --- classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile	(revision 945404)
> +++ classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile	(working copy)
> @@ -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
> Index: classlib/modules/imageio/build.xml
> ===================================================================
> --- classlib/modules/imageio/build.xml	(revision 945404)
> +++ classlib/modules/imageio/build.xml	(working copy)
> @@ -135,15 +135,18 @@
>       </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>
>
>
>
>    

-- 
Oliver Deakin
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU


Mime
View raw message