harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r415732 - in /incubator/harmony/enhanced/classlib/trunk: modules/prefs/ modules/prefs/make/ modules/prefs/src/main/native/ modules/prefs/src/main/native/prefs/ modules/prefs/src/main/native/prefs/windows/ native-src/ native-src/win.IA32/ na...
Date Tue, 20 Jun 2006 17:12:53 GMT
Author: hindessm
Date: Tue Jun 20 10:12:53 2006
New Revision: 415732

URL: http://svn.apache.org/viewvc?rev=415732&view=rev
Log:
Applying patches from "[#HARMONY-628] Move Prefs native code into its module".

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/
      - copied from r415712, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/
Removed:
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=415732&r1=415731&r2=415732&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Tue Jun 20 10:12:53
2006
@@ -33,6 +33,23 @@
 
     <target name="test" depends="build, compile.tests, run.tests" />
 
+	<!-- Build natives. Currently there are only windows natives for
+	prefs, so we check if we are on a windows platform -->
+	<target name="build.native" if="is.windows">
+		<exec failonerror="true" 
+            executable="${make.command}" 
+            dir="${hy.prefs.src.main.native}/prefs/${hy.os}">
+        	<env key="HY_HDK" value="${hy.hdk}" />
+        </exec>
+		
+		<!-- Copy the built shared libs over to the jre/bin dir -->
+		<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.prefs.src.main.native}/prefs">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+	</target>
+
     <target name="clean">
         <delete failonerror="false">
             <fileset dir="${hy.build}"
@@ -40,6 +57,18 @@
             <fileset dir="${hy.prefs.bin.test}" />
         </delete>
     </target>
+
+	<!-- Clean natives. Currently there are only windows natives for
+	prefs, so we check if we are on a windows platform -->
+	<target name="clean.native" if="is.windows">
+		<exec failonerror="true" 
+            executable="${make.command}" 
+            dir="${hy.prefs.src.main.native}/prefs/${hy.os}">
+        	<env key="HY_HDK" value="${hy.hdk}" />
+			<arg line="clean" />
+        </exec>
+	</target>
+
 
     <target name="compile.java">
         <echo message="Compiling PREFS classes" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml?rev=415732&r1=415731&r2=415732&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml Tue Jun
20 10:12:53 2006
@@ -21,12 +21,12 @@
          <main>
             <java location="src/main/java" />
         	<resources location="src/main/resources" />
+        	<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" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile?rev=415732&r1=415712&r2=415732&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
Tue Jun 20 10:12:53 2006
@@ -18,7 +18,6 @@
 
 !include <$(HY_HDK)\build\defines.mak>
 
-SHAREDSUB=$(SHARED)prefs\# comment to avoid \ being treated as continuation
 LIBBASE=hyprefs
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=415732&r1=415731&r2=415732&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Tue Jun 20 10:12:53 2006
@@ -107,6 +107,9 @@
 
     <!-- This target invokes make on the all target to compile all natives -->
     <target name="make-all" depends="properties">
+    	<!-- Create the target directory structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
     	<mkdir dir="${native.lib.target}"/>
     	
     	<antcall target="copy-makefile-includes" />
@@ -117,6 +120,8 @@
         	<env key="HY_HDK" value="${hy.hdk}" />
             <arg line="all" />
         </exec>
+    	
+    	<ant dir="..\modules\prefs" antfile="build.xml" target="build.native" />
     </target>
 
 
@@ -133,6 +138,8 @@
             <arg line="clean" />
         </exec>
     	
+    	<ant dir="..\modules\prefs" antfile="build.xml" target="clean.native" />
+    	
     	<delete dir="${native.lib.target}" />
     	
     	<antcall target="clean-makefile-includes" />
@@ -146,10 +153,6 @@
         depends="properties" 
         description="Construct the correct directory structure for native binaries">
 
-        <!-- Create the structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/include" />
-
         <!-- Copy across the built shared libs -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${target.platform}">
@@ -238,8 +241,8 @@
     	<ant dir="${basedir}/../modules/luni" antfile="build.xml" 
     		target="clean.native.includes" />
 	</target>
-	
-	<!-- ================================= 
+
+    <!-- ================================= 
           target: copy-makefile-includes              
          ================================= -->
 	<target name="copy-makefile-includes" depends="properties" >

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile?rev=415732&r1=415731&r2=415732&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile Tue Jun 20 10:12:53
2006
@@ -21,7 +21,7 @@
 all: \
 	_sig _pool _thread _port _fdlibm _zip \
 	_zlib _common _luni _vmi _auth \
-	_archive _launcher _text _prefs \
+	_archive _launcher _text \
 	_vmls
 
 _auth:
@@ -89,11 +89,6 @@
 	$(MAKE) /NOLOGO
 	cd ..	
 
-_prefs:
-	cd prefs
-	$(MAKE) /NOLOGO
-	cd ..
-
 _vmls: _thread _port
 	cd vmls
 	$(MAKE) /NOLOGO
@@ -145,9 +140,6 @@
 	$(MAKE) /NOLOGO clean
 	cd ..
 	cd zlib
-	$(MAKE) /NOLOGO clean
-	cd ..
-	cd prefs
 	$(MAKE) /NOLOGO clean
 	cd ..
 	cd vmls



Mime
View raw message