harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r454780 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/imageio/ modules/imageio/META-INF/ modules/imageio/make/ modules/imageio/src/main/native/jpegencoder/linux/ modules/imageio/src/main/native/jpegencoder/shared/ modules/i...
Date Tue, 10 Oct 2006 15:22:20 GMT
Author: mloenko
Date: Tue Oct 10 08:22:19 2006
New Revision: 454780

URL: http://svn.apache.org/viewvc?view=rev&rev=454780
Log:
HARMONY-1729
[build] Build files for Applet/ImageIO/Print modules contribution
the patch was applied then copyrights, build failures were fixed

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF   (with
props)
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml   (with
props)
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/test/
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/test/java/
    incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/
    incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/print/make/
    incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml   (with
props)
    incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
    incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
    incubator/harmony/enhanced/classlib/trunk/modules/print/   (props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=454780&r1=454779&r2=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Tue Oct 10 08:22:19 2006
@@ -146,6 +146,7 @@
             <src path="modules/concurrent/src/main/java/" />
             <src path="modules/crypto/src/main/java" />
             <src path="modules/instrument/src/main/java" />
+            <src path="modules/imageio/src/main/java" />
             <src path="modules/jndi/src/main/java" />
             <src path="modules/logging/src/main/java" />
             <src path="modules/lang-management/src/main/java/" />
@@ -156,6 +157,8 @@
             <src path="modules/nio/src/main/java" />
             <src path="modules/nio_char/src/main/java" />
             <src path="modules/prefs/src/main/java" />
+            <src path="modules/print/src/main/java/${hy.os}" />
+            <src path="modules/print/src/main/java/common" />
             <src path="modules/regex/src/main/java" />
             <src path="modules/rmi/src/main/java" />
             <src path="modules/security-kernel/src/main/java" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?view=diff&rev=454780&r1=454779&r2=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Tue Oct 10 08:22:19 2006
@@ -80,6 +80,8 @@
         <ant dir="modules/awt" antfile="build.xml" target="build-native" />    	
         <ant dir="modules/security" antfile="build.xml" target="build-native" />  
 	
         <ant dir="modules/instrument" antfile="build.xml" target="build-native" />
   	
+        <ant dir="modules/imageio" antfile="build.xml" target="build-native" />   
	
+        <ant dir="modules/print" antfile="build.xml" target="build-native" />    	
     </target>
 
 

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF Tue Oct
10 08:22:19 2006
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony ImageIO
+Bundle-SymbolicName: org.apache.harmony.x.imageio
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.awt
+Export-Package: javax.imageio

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/imageio/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml Tue Oct 10 08:22:19
2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="ImageIO Build" default="build" basedir=".">
+    <description>Build for ImageIO component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <or>
+            <present targetdir="${hy.imageio.src.main.java}" />
+            <present targetdir="${hy.imageio.src.main.java}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
+    </fileset>
+
+    <target name="build" depends="compile-java, copy-resources, build-jar" />
+
+    <target name="test" depends="build, compile-tests, run-tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.imageio.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile-java">
+        <echo message="Compiling ImageIO classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.imageio.src.main.java}"
+               destdir="${hy.build}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+    
+    <target name="build-native">
+        <make dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.imageio.src.main.native}/jpegencoder/">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+
+
+
+    <target name="copy-resources">
+        <mkdir dir="${hy.build}" />
+        <copy todir="${hy.build}" includeemptydirs="false">
+            <fileset dir="${hy.imageio.src.main.java}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="build-jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
+             manifest="${hy.imageio}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile-tests">
+        <echo message="Compiling ImageIO tests" />
+
+        <mkdir dir="${hy.imageio.bin.test}" />
+
+        <javac srcdir="${hy.imageio.src.test.java}"
+               destdir="${hy.imageio.bin.test}"
+               sourcepath=""
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run-tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${basedir}"
+               jvm="${test.jre.home}/bin/java">
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.imageio.bin.test}"/>
+            </classpath>
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.imageio.src.test.java}"/>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">imageio${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">imageio${line.separator}</echo>
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml Tue Oct
10 08:22:19 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<hy>
+   <imageio location=".">
+      <src>
+         <main>
+            <java location="src/main/java" />
+        	<native location="src/main/native" />
+         </main>
+         <test>
+            <java location="src/test/java" />
+            <resources location="src/test/resources" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+      </bin>
+      <packaging>
+      </packaging>
+   </imageio>
+
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
+   <build location="../../build/classes" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/libjpegencoder.exp
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,10 @@
+HYJPEGDECODER_0.1 {
+    global :
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_dispose;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initWriterIds;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_initCompressionObj;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_setIOS;
+        Java_org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter_encode;
+    local : *;
+};
+

Added: 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=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include $(HY_HDK)/build/make/makefile.include
+
+JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
+
+BUILDFILES = \
+  $(SHAREDSUB)/JpegEncoder.o \
+  libjpeg.a
+
+MDLLIBFILES = \
+	$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME=../libjpegencoder.so
+
+include $(HY_HDK)/build/make/rules.mk
+
+$(SHAREDSUB)JpegEncoder.o: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.lnx
+	cp $< $@
+
+libjpeg.a: $(JPEG_DIR)libjpeg.ia32
+	cp $< $@
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c?view=diff&rev=454780&r1=454779&r2=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/shared/JpegEncoder.c
Tue Oct 10 08:22:19 2006
@@ -197,7 +197,7 @@
     //-- create compress struct
     cinfo = malloc(sizeof(struct jpeg_compress_struct));
     if (!cinfo) {
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return 0;
     }
 
@@ -205,7 +205,7 @@
     err_mgr = malloc(sizeof(enc_error_mgr));
     if (!err_mgr) {
         free(cinfo);
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return 0;
     }
     
@@ -221,7 +221,7 @@
     if (!dest_mgr) {
         free(cinfo);
         free(err_mgr);
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return 0;
     }
     cinfo->dest = dest_mgr;
@@ -232,7 +232,7 @@
         free(cinfo);
         free(err_mgr);
         free(dest_mgr);
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return 0;
     }
     cinfo->client_data = client_data;
@@ -243,7 +243,7 @@
         free(err_mgr);
         free(dest_mgr);
         free(client_data);
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return 0;
     }
     dest_mgr->next_output_byte = client_data->jpeg_buffer;
@@ -327,7 +327,7 @@
     }
     cdata->ios = (*env)->NewGlobalRef(env, iosObj);
     if (cdata->ios == NULL) {
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return;
     }
     cinfo->dest->next_output_byte = cdata->jpeg_buffer;
@@ -360,7 +360,7 @@
     row_pointer = (JSAMPROW) malloc(width * numBands);
 
     if (!row_pointer) {
-        throwNewOutOfMemoryError("Unable to allocate memory for IJG structures");
+        throwNewOutOfMemoryError(env, "Unable to allocate memory for IJG structures");
         return FALSE;
     }
 

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.def
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,7 @@
+LIBRARY	JPEGENCODER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/jpegencoder.rc
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,48 @@
+;
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements.  See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License.  You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "JPEG encoder native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "jpegencoder\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors,
as applicable.\0"
+			VALUE "OriginalFilename", "jpegencoder.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Added: incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+
+LIBBASE=jpegencoder
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+
+BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software
Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
+
+$(SHAREDSUB)JpegEncoder.obj: jconfig.h
+
+jconfig.h: $(JPEG_DIR)jconfig.vc
+	copy $(JPEG_DIR)jconfig.vc $@

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/print/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 10 08:22:19 2006
@@ -0,0 +1,2 @@
+
+bin

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF Tue Oct 10
08:22:19 2006
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony Print
+Bundle-SymbolicName: org.apache.harmony.print
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.awt
+Export-Package: javax.print

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/print/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml Tue Oct 10 08:22:19
2006
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="Print Build" default="build" basedir=".">
+    <description>Build for Print component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <property name="hy.print.src.main.java.platform"
+              value="${hy.print.src.main.java}/../${hy.os}" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <or>
+            <present targetdir="${hy.print.src.main.java}" />
+            <present targetdir="${hy.print.src.main.java}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+            <present targetdir="${hy.print.src.main.java.platform}" />
+            <present targetdir="${hy.print.src.main.java.platform}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
+    </fileset>
+
+    <target name="build" depends="compile-java, copy-resources, build-jar" />
+
+    <target name="test" depends="build, compile-tests, run-tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.print.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile-java">
+        <echo message="Compiling Print classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.print.src.main.java}"
+               destdir="${hy.build}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+    
+    <target name="build-native" if="is.windows">
+        <make dir="${hy.print.src.main.native}/print/${hy.os}" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.print.src.main.native}/print/">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+
+
+
+    <target name="copy-resources">
+        <mkdir dir="${hy.build}" />
+        <copy todir="${hy.build}" includeemptydirs="false">
+            <fileset dir="${hy.print.src.main.java}">
+                <exclude name="**/*.java" />
+		<exclude name="**/javax.print.StreamPrintServiceFactory" />
+		<exclude name="**/javax.print.PrintServiceLookup" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="build-jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/print.jar"
+             manifest="${hy.print}/META-INF/MANIFEST.MF">
+            <metainf prefix="META-INF/services" dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
+                includes="javax.print.StreamPrintServiceFactory"/>
+            <metainf prefix="META-INF/services" dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
+                includes="javax.print.PrintServiceLookup"/>
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile-tests">
+        <echo message="Compiling Print tests" />
+
+        <mkdir dir="${hy.print.bin.test}" />
+
+        <javac srcdir="${hy.print.src.test.java}"
+               destdir="${hy.print.bin.test}"
+               sourcepath=""
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run-tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${basedir}"
+               jvm="${test.jre.home}/bin/java">
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.print.bin.test}"/>
+            </classpath>
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.print.src.test.java}">
+                    <exclude name="javax/print/GetAttributesTest.java" />
+                    <exclude name="javax/print/GetAttributeTest.java" />
+                    <exclude name="javax/print/GetDefaultAttributeValueTest.java" />
+                    <exclude name="javax/print/GetSupportedAttributeCategoriesTest.java"
/>
+                    <exclude name="javax/print/GetSupportedAttributeValuesTest.java" />
+                    <exclude name="javax/print/GetSupportedDocFlavorsTest.java" />
+                    <exclude name="javax/print/GetUnsupportedAttributesTest.java" />
+                    <exclude name="javax/print/IsAttributeCategorySupportedTest.java"
/>
+                    <exclude name="javax/print/IsAttributeValueSupportedTest.java" />
+                    <exclude name="javax/print/LookupDefaultPrintServiceTest.java" />
+                    <exclude name="javax/print/LookupPrintServicesTest.java" />
+                    <exclude name="javax/print/PrintAutosenseTest.java" />
+                    <exclude name="javax/print/PrintJpegTest.java" />
+                    <exclude name="javax/print/PrintTest.java" />
+                    <exclude name="javax/print/ValueTests.java" />
+                    <exclude name="javax/print/attribute/ExtendEnumSyntax.java" />
+		</fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">print${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">print${line.separator}</echo>
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml Tue Oct
10 08:22:19 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<hy>
+   <print location=".">
+      <src>
+         <main>
+            <java location="src/main/java/common" />
+        	<native location="src/main/native" />
+         </main>
+         <test>
+            <java location="src/test/api/java/common" />
+            <resources location="src/test/resources" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+      </bin>
+      <packaging>
+      </packaging>
+   </print>
+
+   <hdk location="../../deploy" />
+   <jdk location="../../deploy/jdk" />
+   <build location="../../build/classes" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBBASE=print
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0500 -D_WINSOCKAPI_ -DWINVER=0x0500 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  -I$(SHAREDSUB)\include
+
+BUILDFILES = print.obj \
+ui.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = #\
+#  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+#  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"Print native code. (c) Copyright 2005 - 2006 The Apache Software Foundation
or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
+

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,7 @@
+LIBRARY	JPEGENCODER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Added: incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc?view=auto&rev=454780
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
Tue Oct 10 08:22:19 2006
@@ -0,0 +1,48 @@
+;
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements.  See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License.  You may obtain a copy of the License at
+; 
+;     http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "JPEG encoder native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "jpegencoder\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors,
as applicable.\0"
+			VALUE "OriginalFilename", "jpegencoder.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END



Mime
View raw message