harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r451210 - in /incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument: linux/makefile windows/hyinstrument.rc windows/makefile
Date Fri, 29 Sep 2006 10:08:33 GMT
Author: hindessm
Date: Fri Sep 29 03:08:32 2006
New Revision: 451210

URL: http://svn.apache.org/viewvc?view=rev&rev=451210
Log:
Fixed eol style so that I the re-licensing script can work.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
  (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc
  (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
  (contents, props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile?view=diff&rev=451210&r1=451209&r2=451210
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
Fri Sep 29 03:08:32 2006
@@ -1,33 +1,33 @@
-# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
-# 
-# Licensed 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 'instrument'
-#
-
-include $(HY_HDK)/build/make/makefile.include
-
-CFLAGS += -fpic
-
-BUILDFILES = \
-	../shared/instrument.o ../shared/inst_agt.o 
-
-MDLLIBFILES = \
-	$(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
-	$(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-
-DLLNAME = ../libhyinstrument.so
-
-include $(HY_HDK)/build/make/rules.mk
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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 'instrument'
+#
+
+include $(HY_HDK)/build/make/makefile.include
+
+CFLAGS += -fpic
+
+BUILDFILES = \
+	../shared/instrument.o ../shared/inst_agt.o 
+
+MDLLIBFILES = \
+	$(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+	$(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
+
+DLLNAME = ../libhyinstrument.so
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc?view=diff&rev=451210&r1=451209&r2=451210
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc
Fri Sep 29 03:08:32 2006
@@ -1,47 +1,47 @@
-;
-; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
-; 
-; Licensed 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", "INSTRUMENT native code\0"
-            VALUE "FileVersion", "0.1\0"
-            VALUE "InternalName", "instrument\0"
-            VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or
its licensors, as applicable.\0"
-            VALUE "OriginalFilename", "hyinstrument.dll\0"
-            VALUE "ProductName", "Apache Harmony\0"
-            VALUE "ProductVersion", "0.1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+;
+; Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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", "INSTRUMENT native code\0"
+            VALUE "FileVersion", "0.1\0"
+            VALUE "InternalName", "instrument\0"
+            VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or
its licensors, as applicable.\0"
+            VALUE "OriginalFilename", "hyinstrument.dll\0"
+            VALUE "ProductName", "Apache Harmony\0"
+            VALUE "ProductVersion", "0.1\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/hyinstrument.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?view=diff&rev=451210&r1=451209&r2=451210
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
Fri Sep 29 03:08:32 2006
@@ -1,41 +1,41 @@
-# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
-# 
-# Licensed 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 'instrument'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-LIBBASE=hyinstrument
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-
-BUILDFILES = \
-  $(SHAREDSUB)instrument.obj $(SHAREDSUB)inst_agt.obj 
-  
-VIRTFILES = hyinstrument.res
-
-SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES = \
-  $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
-  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
-  
-DLLBASE=0x13200000
-COMMENT=/comment:"instrument component native code. (c) Copyright 2006 The Apache Software
Foundation or its licensors, as applicable."
-
-!include <$(HY_HDK)\build\make\rules.mak>
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed 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 'instrument'
+#
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBBASE=hyinstrument
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+BUILDFILES = \
+  $(SHAREDSUB)instrument.obj $(SHAREDSUB)inst_agt.obj 
+  
+VIRTFILES = hyinstrument.res
+
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+  $(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib $(LIBPATH)hyzlib.lib \
+  $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+  
+DLLBASE=0x13200000
+COMMENT=/comment:"instrument component native code. (c) Copyright 2006 The Apache Software
Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message