harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r511897 - in /harmony/enhanced/classlib/trunk: depends/build/ depends/libs/windows.x86_64/ make/ modules/archive/ modules/archive/src/main/native/archive/ modules/archive/src/main/native/zlib/ modules/auth/ modules/auth/src/main/native/auth...
Date Mon, 26 Feb 2007 17:00:24 GMT
Author: ayza
Date: Mon Feb 26 09:00:20 2007
New Revision: 511897

URL: http://svn.apache.org/viewvc?view=rev&rev=511897
Log:
Fix that allows embedding assembly manifests into corresponding DLL/EXE files during the build
process. This was MSVS 2005-specific issue. See HARMONY-3240.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/rules.mak
    harmony/enhanced/classlib/trunk/depends/libs/windows.x86_64/   (props changed)
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/   (props changed)
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/   (props changed)
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/   (props changed)
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/   (props
changed)
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/ 
 (props changed)
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/   (props changed)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/   (props changed)
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/   (props changed)
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/windows.x86_64/
  (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/windows.x86_64/
  (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/   (props changed)
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/   (props changed)
    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/   (props
changed)
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/   (props changed)
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/   (props
changed)
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/   (props changed)

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mak?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Mon Feb 26 09:00:20 2007
@@ -47,24 +47,29 @@
 $(DLLNAME): $(LIBNAME)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
 	$(ENTRY_OPTION) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
-        $(COMMENT) \
+		$(COMMENT) \
 	-subsystem:windows -out:$@ -map:$*.map \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib \
-        comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+		comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+	if exist $(DLLNAME).manifest \
+		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
+#	del /Q $(DLLNAME).manifest
 !endif
 
 !ifdef EXENAME
 $(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
 	-out:$(EXENAME) -machine:$(CPU) setargv.obj  \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES) 
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
+	if exist $(EXENAME).manifest \
+		mt -manifest $(EXENAME).manifest -outputresource:$(EXENAME);#1
 !endif
 
 clean:
     -del $(BUILDFILES) *.res *.pdb \
              $(LIBNAME) $(LIBNAME:.lib=.exp) \
              $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
-             $(EXENAME) $(EXENAME:.exe=.pdb) \
-             $(CLEANFILES)
-#             $(CLEANFILES) >nul 2>&1
+			 $(DLLNAME).manifest \
+             $(EXENAME) $(EXENAME:.exe=.pdb) $(EXENAME).manifest \
+             $(CLEANFILES) >nul 2>&1

Propchange: harmony/enhanced/classlib/trunk/depends/libs/windows.x86_64/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -0,0 +1,2 @@
+msvcr80.dll
+swing_awt_deps_win64_2007-02-08.tgz

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Feb 26 09:00:20 2007
@@ -178,6 +178,8 @@
     </condition>
     <property name="linklib.suffix" value=".so" />
 
+    <property name="manifest.suffix" value=".manifest" />
+
     <condition property="make.command" value="nmake.exe">
         <isset property="is.windows"/>
     </condition>

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Feb 26 09:00:20 2007
@@ -71,15 +71,17 @@
         
         <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.archive.src.main.native}/zlib">
-                <patternset includes="*${shlib.suffix}*" />
+            <fileset dir="${hy.archive.src.main.native}/zlib">
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
         
     <make dir="${hy.archive.src.main.native}/archive/${hy.os.family}" />
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.archive.src.main.native}/archive">
-                <patternset includes="*${shlib.suffix}*" />
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.archive.src.main.native}/archive">
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,4 +2,5 @@
 *.map
 *.pdb
 *.so
+*.manifest
 

Propchange: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Feb 26 09:00:20 2007
@@ -72,12 +72,13 @@
     
     <!-- Build native code -->
     <target name="build-native" >
-    <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" />
+        <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" />
 
-    <!-- Copy the built shared libs over to the jre/bin dir -->
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.auth.src.main.native}/auth">
-                <patternset includes="*${shlib.suffix}*" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.auth.src.main.native}/auth">
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Feb 26 09:00:20 2007
@@ -143,7 +143,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/lcmm">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 
@@ -151,7 +152,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/jpegdecoder">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 
@@ -159,7 +161,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/gl">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
         
@@ -167,7 +170,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/oglwrapper">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>
@@ -177,7 +181,7 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/x11wrapper">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
             </fileset>
         </copy>
 
@@ -185,7 +189,7 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/linuxfont">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
             </fileset>
         </copy>
     </target>
@@ -195,7 +199,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/win32wrapper">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 
@@ -203,7 +208,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/winfont">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Mon Feb 26 09:00:20 2007
@@ -103,7 +103,8 @@
         <!-- 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}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 libjpegencoder.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,4 +1,3 @@
-
 jconfig.h
 jpegencoder.RES
-vc70.pdb
+*.pdb

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Feb 26 09:00:20 2007
@@ -121,7 +121,8 @@
         <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.luni.src.main.native}/luni">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*" />
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.exe
 *.pdb
 java
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Mon Feb 26 09:00:20 2007
@@ -123,10 +123,11 @@
     <target name="build-native" >
         <make dir="${hy.misc.src.main.native}/accessors/${hy.os.family}" />
 
-    <!-- Copy the built shared libs over to the jre/bin dir -->
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.misc.src.main.native}/accessors">
-                <patternset includes="*${shlib.suffix}*" />
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.misc.src.main.native}/accessors">
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Feb 26 09:00:20 2007
@@ -71,7 +71,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.nio.src.main.native}/nio">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,5 @@
 *.map
 *.pdb
 *.so
+*.manifest
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Mon Feb 26 09:00:20 2007
@@ -86,7 +86,8 @@
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/sig">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*" />
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>
@@ -97,7 +98,8 @@
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/thread">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*" />
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>
@@ -108,7 +110,8 @@
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/port">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*" />
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 
@@ -120,7 +123,6 @@
         <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" target="clean"
/>
         <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" target="clean"
/>
         <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" target="clean"
/>
-
     </target>
 
     <target name="-clean-native-sig" unless="hy.skip.sig">

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/windows/windows.x86_64/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -0,0 +1 @@
+*.obj

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/windows.x86_64/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -0,0 +1 @@
+*.obj

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.exe
 *.pdb
 *.obj
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/windows/makefile
Mon Feb 26 09:00:20 2007
@@ -19,7 +19,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=../hyerror.exe
+EXENAME=..\hyerror.exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyerror.obj

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.exe
 *.pdb
 *.obj
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/windows/makefile
Mon Feb 26 09:00:20 2007
@@ -19,7 +19,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=../hyfile.exe
+EXENAME=..\hyfile.exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hyfile.obj

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.exe
 *.pdb
 *.obj
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/windows/makefile
Mon Feb 26 09:00:20 2007
@@ -19,7 +19,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=../hytime.exe
+EXENAME=..\hytime.exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)hytime.obj

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.exe
 *.pdb
 *.obj
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/windows/makefile
Mon Feb 26 09:00:20 2007
@@ -19,7 +19,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=../init.exe
+EXENAME=..\init.exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)init.obj

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Feb 26 09:00:20 2007
@@ -60,14 +60,15 @@
     <!-- 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">
-    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" />
+        <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" />
 
-    <!-- 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>
+        <!-- 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">
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
+            </fileset>
+        </copy>
     </target>
 
     <target name="clean">

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.pdb
 *.map
 *.dll
+*.manifest

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Mon Feb 26 09:00:20 2007
@@ -107,7 +107,8 @@
         <!-- 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}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 *.dll
 *.map
 *.pdb
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,4 +1,4 @@
-
 *.obj
 *.RES
 vc70.pdb
+*.pdb

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Feb 26 09:00:20 2007
@@ -86,7 +86,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.security.src.main.native}/security">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,4 +1,4 @@
-
 hysecurity.dll
 hysecurity.map
 hysecurity.pdb
+*.manifest

Propchange: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -1,3 +1,4 @@
 hysecurity.RES
 vc70.pdb
 *.obj
+*.pdb

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=511897&r1=511896&r2=511897
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Feb 26 09:00:20 2007
@@ -62,7 +62,8 @@
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.text.src.main.native}/text">
-                <patternset includes="*${shlib.suffix}*" />
+                <include name="*${shlib.suffix}*"/>
+                <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
     </target>

Propchange: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 26 09:00:20 2007
@@ -2,3 +2,4 @@
 *.map
 *.pdb
 *.so
+*.manifest



Mime
View raw message