You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/12/01 22:56:08 UTC
svn commit: r481418 - in /harmony/enhanced/classlib/trunk/depends/build:
defines.mak defines.mk rules.mak rules.mk
Author: hindessm
Date: Fri Dec 1 13:56:07 2006
New Revision: 481418
URL: http://svn.apache.org/viewvc?view=rev&rev=481418
Log:
Fixing eol-style.
Modified:
harmony/enhanced/classlib/trunk/depends/build/defines.mak (contents, props changed)
harmony/enhanced/classlib/trunk/depends/build/defines.mk (contents, props changed)
harmony/enhanced/classlib/trunk/depends/build/rules.mak (contents, props changed)
harmony/enhanced/classlib/trunk/depends/build/rules.mk (contents, props changed)
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?view=diff&rev=481418&r1=481417&r2=481418
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Fri Dec 1 13:56:07 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.
-
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
-EXEPATH=..\# ditto
-DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
-SHAREDSUB=..\shared\# ditto
-
-HYCFLAGS = \
- -Ogityb1 -WX -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.
+# 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.
+
+APPVER=4.0
+TARGETOS=WIN95
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
+EXEPATH=..\# ditto
+DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+SHAREDSUB=..\shared\# ditto
+
+HYCFLAGS = \
+ -Ogityb1 -WX -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.
Propchange: harmony/enhanced/classlib/trunk/depends/build/defines.mak
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=481418&r1=481417&r2=481418
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Fri Dec 1 13:56:07 2006
@@ -1,33 +1,33 @@
-# 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.
-
-#
-# Configuration Makefile
-#
-
-CXX = $(CC)
-CPP = $(CC) -E
-AS = as
-AR = ar
-DLL_LD = $(CC)
-CXX_DLL_LD = $(CXX)
-
-EXEPATH=../
-LIBPATH=$(HY_HDK)/lib/
-DLLPATH=$(HY_HDK)/jdk/jre/bin/
-SHAREDSUB=../shared/
-
-CFLAGS = -O1 $(HY_CFLAGS) -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
- -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CXX = $(CC)
+CPP = $(CC) -E
+AS = as
+AR = ar
+DLL_LD = $(CC)
+CXX_DLL_LD = $(CXX)
+
+EXEPATH=../
+LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
+SHAREDSUB=../shared/
+
+CFLAGS = -O1 $(HY_CFLAGS) -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
+ -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
Propchange: harmony/enhanced/classlib/trunk/depends/build/defines.mk
------------------------------------------------------------------------------
svn:eol-style = native
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=481418&r1=481417&r2=481418
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Fri Dec 1 13:56:07 2006
@@ -1,59 +1,59 @@
-# 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.
-
-.c.obj:
- $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
-
-.cpp.obj:
- $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
-
-.asm.obj:
- ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
-
-.rc.res:
- rc -I..\include $<
-
-all: $(DLLNAME) $(EXENAME) $(LIBNAME)
-
-!ifdef LIBNAME
-$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
- $(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
- $(HYLDFLAGS) -machine:$(CPU) \
- $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-!endif
-
-!ifdef DLLNAME
-$(DLLNAME): $(LIBNAME)
- link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
- -entry:_DllMainCRTStartup@12 -dll /BASE:$(DLLBASE) -machine:$(CPU) \
- $(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
-!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)
-!endif
-
-clean:
- -del $(BUILDFILES) *.res *.pdb \
- $(LIBNAME) $(LIBNAME:.lib=.exp) \
- $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
- $(EXENAME) $(EXENAME:.exe=.pdb) >nul 2>&1
+# 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.
+
+.c.obj:
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+
+.cpp.obj:
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
+
+.asm.obj:
+ ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+.rc.res:
+ rc -I..\include $<
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+!ifdef LIBNAME
+$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+ $(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
+ $(HYLDFLAGS) -machine:$(CPU) \
+ $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+!endif
+
+!ifdef DLLNAME
+$(DLLNAME): $(LIBNAME)
+ link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+ -entry:_DllMainCRTStartup@12 -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+ $(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
+!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)
+!endif
+
+clean:
+ -del $(BUILDFILES) *.res *.pdb \
+ $(LIBNAME) $(LIBNAME:.lib=.exp) \
+ $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
+ $(EXENAME) $(EXENAME:.exe=.pdb) >nul 2>&1
Propchange: harmony/enhanced/classlib/trunk/depends/build/rules.mak
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=481418&r1=481417&r2=481418
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Fri Dec 1 13:56:07 2006
@@ -1,44 +1,44 @@
-# 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.
-
-#
-# Configuration Makefile
-#
-
-CXXFLAGS=$(CFLAGS)
-
-all: $(DLLNAME) $(EXENAME) $(LIBNAME)
-
-$(LIBNAME): $(BUILDFILES)
- $(AR) rcv $@ $(BUILDFILES)
-
-$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
- $(DLL_LD) -shared -Wl,--version-script,$(@F:.so=.exp) \
- -Wl,-soname=$(@F) $(VMLINK) -o $@ \
- $(BUILDFILES) $(SYSLIBFILES) \
- -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
- -lc -lm -ldl $(LDFLAGS)
-
-$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
- $(CC) $(VMLINK) \
- $(BUILDFILES) \
- -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
- -o $@ -lm -lpthread -lc -ldl \
- -Xlinker -z -Xlinker origin \
- -Xlinker -rpath -Xlinker \$$ORIGIN/ \
- -Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin
-
-clean:
- -rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME)
+# 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.
+
+#
+# Configuration Makefile
+#
+
+CXXFLAGS=$(CFLAGS)
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+$(LIBNAME): $(BUILDFILES)
+ $(AR) rcv $@ $(BUILDFILES)
+
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+ $(DLL_LD) -shared -Wl,--version-script,$(@F:.so=.exp) \
+ -Wl,-soname=$(@F) $(VMLINK) -o $@ \
+ $(BUILDFILES) $(SYSLIBFILES) \
+ -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+ -lc -lm -ldl $(LDFLAGS)
+
+$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
+ $(CC) $(VMLINK) \
+ $(BUILDFILES) \
+ -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
+ -o $@ -lm -lpthread -lc -ldl \
+ -Xlinker -z -Xlinker origin \
+ -Xlinker -rpath -Xlinker \$$ORIGIN/ \
+ -Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin
+
+clean:
+ -rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME)
Propchange: harmony/enhanced/classlib/trunk/depends/build/rules.mk
------------------------------------------------------------------------------
svn:eol-style = native