harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r485843 - in /harmony/enhanced/jdktools/trunk: make/ modules/launcher/src/main/native/launcher/windows/ modules/samsa/src/main/native/samsa/windows/
Date Mon, 11 Dec 2006 19:45:53 GMT
Author: geirm
Date: Mon Dec 11 11:45:53 2006
New Revision: 485843

URL: http://svn.apache.org/viewvc?view=rev&rev=485843
Log:
tweaks to build on windows


Modified:
    harmony/enhanced/jdktools/trunk/make/build-native.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile

Modified: harmony/enhanced/jdktools/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-native.xml?view=diff&rev=485843&r1=485842&r2=485843
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-native.xml Mon Dec 11 11:45:53 2006
@@ -112,8 +112,7 @@
     </target>
 
     <target name="layout.windows" if="is.windows">
-        <!-- workaround until msdll is moved. -->
-        <copy file="${msvcr71.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+        <!-- workaround for msdll is removed. -->
     </target>
 
     <!-- ================================= 

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae?view=diff&rev=485843&r1=485842&r2=485843
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
(original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
Mon Dec 11 11:45:53 2006
@@ -1,32 +1,32 @@
-#  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.
-
-#
-# Makefile for module 'launcher.java'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-EXENAME=$(EXEPATH)java.exe
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
-
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
-        $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
-VIRTFILES = java.res
-MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
-EXEFLAGS=$(conlflags) -subsystem:console
-EXEDLLFILES=$(conlibsdll)
-
-!include <$(HY_HDK)\build\make\rules.mak>
+#  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.
+
+#
+# Makefile for module 'launcher.java'
+#
+
+!include <$(HY_JDKTOOLS)\make\defines.mak>
+
+EXENAME=$(EXEPATH)java.exe
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+
+BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
+        $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+VIRTFILES = java.res
+MDLLIBFILES = $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
+EXEFLAGS=$(conlflags) -subsystem:console
+EXEDLLFILES=$(conlibsdll)
+
+!include <$(HY_JDKTOOLS)\make\rules.mak>

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw?view=diff&rev=485843&r1=485842&r2=485843
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw
(original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javaw
Mon Dec 11 11:45:53 2006
@@ -1,30 +1,30 @@
-#  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.
-
-#
-# Makefile for module 'launcher.javaw'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-EXENAME=$(EXEPATH)javaw.exe
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
-        winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
-VIRTFILES = javaw.res
-MDLLIBFILES =  $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
-EXEFLAGS=$(guilflags) -subsystem:windows
-EXEDLLFILES=$(guilibsdll)
-
-!include <$(HY_HDK)\build\make\rules.mak>
+#  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.
+
+#
+# Makefile for module 'launcher.javaw'
+#
+
+!include <$(HY_JDKTOOLS)\make\defines.mak>
+
+EXENAME=$(EXEPATH)javaw.exe
+BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
+        winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+VIRTFILES = javaw.res
+MDLLIBFILES =  $(LIBPATH)hycommon.lib $(LIBPATH)hyprt.lib $(LIBPATH)hythr.lib 
+EXEFLAGS=$(guilflags) -subsystem:windows
+EXEDLLFILES=$(guilibsdll)
+
+!include <$(HY_JDKTOOLS)\make\rules.mak>

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile?view=diff&rev=485843&r1=485842&r2=485843
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile Mon
Dec 11 11:45:53 2006
@@ -1,27 +1,27 @@
-#  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.
-
-#
-# Makefile for module samsa
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-EXENAME = samsa.exe
-BUILDFILES = ..\samsa.obj
-EXEFLAGS=$(conlflags) -subsystem:console
-EXEDLLFILES=$(conlibsdll)
-
-!include <$(HY_HDK)\build\make\rules.mak>
+#  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.
+
+#
+# Makefile for module samsa
+#
+
+!include <$(HY_JDKTOOLS)\make\defines.mak>
+
+EXENAME = samsa.exe
+BUILDFILES = ..\samsa.obj
+EXEFLAGS=$(conlflags) -subsystem:console
+EXEDLLFILES=$(conlibsdll)
+
+!include <$(HY_JDKTOOLS)\make\rules.mak>



Mime
View raw message