harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1027390 [4/6] - in /harmony/enhanced/java/trunk: ./ classlib/ classlib/depends/build/ classlib/make/ classlib/modules/accessibility/ classlib/modules/accessibility/make/ classlib/modules/annotation/ classlib/modules/annotation/make/ classl...
Date Tue, 26 Oct 2010 07:13:30 GMT
Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc32.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc32.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc32.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,36 @@
+#  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.
+
+CC = xlc_r
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
+	    -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+            -D_LARGE_FILES -qsuppress=1500-010
+OSLIBS = -lc_r -lC_r -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
+STDCLIBS = 
+WARNFLAGS =
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
+
+ARFLAGS = -X32
+ASFLAGS += -a32 -mppc
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -G -bnoentry -bernotok
+EXELDFLAGS = -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,36 @@
+#  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.
+
+CC = xlc_r
+DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
+            -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+            -D_LARGE_FILES -qsuppress=1500-010
+OSLIBS = -lc_r -lC_r -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
+STDCLIBS = 
+WARNFLAGS =
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
+
+ARFLAGS = -X64
+ASFLAGS += -a64 -many
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -b64 -G -bnoentry -bernotok
+EXELDFLAGS = -q64 -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
+           -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -march=pentium3
+OSLIBS = -L/usr/local/lib -lpthread
+INCLUDES += -I/usr/local/include
+XLIBS = -lX11 -lXft -lXext -lXtst

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86_64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86_64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86_64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,20 @@
+#  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.
+
+DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
+           -DIPv6_FUNCTION_SUPPORT
+OSLIBS = -L/usr/local/lib -lpthread
+INCLUDES += -I/usr/local/include
+XLIBS = -lX11 -lXft -lXext -lXtst

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ia64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ia64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ia64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,18 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc32.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc32.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc32.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m32
+ASFLAGS += -a32
+LDFLAGS += -m32
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,22 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m64
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+ASFLAGS += -a64
+LDFLAGS += -m64
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m31
+ASFLAGS += -m31
+LDFLAGS += -m31
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390x.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390x.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390x.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -m64
+ASFLAGS += -m64
+LDFLAGS += -m64
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,20 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -march=pentium3
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
+DEPFLAGS = -MD

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86_64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86_64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86_64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,21 @@
+#  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.
+
+DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
+PLATFORM := -DPOINTER64 -fPIC # TOFIX drlvm hack
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes
+DEPFLAGS = -MD

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.ppc32.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.ppc32.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.ppc32.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,28 @@
+#  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.
+
+DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -fno-common
+OSLIBS += -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+# TOFIX: exports?
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,34 @@
+#  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.
+
+CC = gcc-4.2
+CXX = g++-4.2
+
+DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+
+# Add the default location of the macports.org install to the includes
+INCLUDES += -I/opt/local/include
+PLATFORM = -fPIC -fno-common -arch i386 -mmacosx-version-min=10.5
+ASFLAGS += -arch i386
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86_64.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86_64.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86_64.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +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.
+
+DEFINES += -DMACOSX -DMACOSX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
+
+# Add the default location of the macports.org install to the includes
+INCLUDES += -I/opt/local/include
+PLATFORM = -fPIC -fno-common -arch x86_64 -mmacosx-version-min=10.5
+ASFLAGS += -arch x86_64
+# WARNFLAGS += -Wconversion -Wformat -Wshorten-64-to-32
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,58 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 \
+           -DIPv6_FUNCTION_SUPPORT
+PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
+           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+
+CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)" -Wc,gonumber
+CXXFLAGS += -+ -Wc,"langlvl(extended)" -Wc,gonumber
+
+ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff \
+           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
+LDFLAGS += -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# No need to specify STDC libs on z/OS
+STDCLIBS =
+
+# Don't use these flags on zOS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on zOS
+EXERPATHPREFIX =
+
+# Different compiler on zOS
+WARNFLAGS =
+
+# z/OS has different debug flags
+HYDEBUGCFLAGS = -g -O0
+
+# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
+# $(HY_HDK)/lib instead of directly against the .so libraries.
+DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x

Added: harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390x.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390x.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390x.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,58 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 \
+           -DIPv6_FUNCTION_SUPPORT
+PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
+           -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+
+CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)"
+CXXFLAGS += -+ -Wc,"langlvl(extended)"
+
+ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\)  -Wa,goff -Wc,NOANSIALIAS \
+           -Wc,DLL,EXPORTALL -Wa,SYSPARM\(BIT64\) -c
+LDFLAGS += -Wl,lp64 -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# No need to specify STDC libs on z/OS
+STDCLIBS =
+
+# Don't use these flags on z/OS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on z/OS
+EXERPATHPREFIX = 
+
+# Different compiler on zOS
+WARNFLAGS =
+
+# z/OS has different debug flags
+HYDEBUGCFLAGS = -g -O0
+
+# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
+# $(HY_HDK)/lib instead of directly against the .so libraries.
+DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x

Added: harmony/enhanced/java/trunk/common_resources/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/rules.mak?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/rules.mak (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/rules.mak Tue Oct 26 07:13:24 2010
@@ -0,0 +1,149 @@
+# 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.
+
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+ml=ml64
+DLLENTRY=
+!ELSE
+ml=ml
+DLLENTRY=@12
+!ENDIF
+
+.rc.res:
+	rc -I..\include $<
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME) $(HDKINCLUDES)
+
+!ifdef LIBNAME
+$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
+	$(HYLDFLAGS) -machine:$(CPU) \
+	/NODEFAULTLIB:libc \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+!endif
+
+!ifdef DLLNAME
+$(DLLNAME): $(LIBNAME)
+	-mkdir $(DBGPATH)
+	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
+	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+	-subsystem:windows -out:$@ \
+	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
+	-manifest:no \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
+	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
+	comdlg32.lib winspool.lib $(LIBPATH)$(*F).exp
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(DLLNAME);#2
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
+!endif
+
+!ifdef EXENAME
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	-mkdir $(DBGPATH)
+	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
+	-manifest:no \
+	-machine:$(CPU) setargv.obj  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(EXENAME);#1
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
+!endif
+
+clean:
+    -del $(BUILDFILES) >nul 2>&1
+    -del *.res >nul 2>&1
+    -del *.pdb >nul 2>&1
+    -del $(LIBNAME) >nul 2>&1
+    -del $(LIBNAME:.lib=.exp) >nul 2>&1
+    -del $(LIBNAME:.lib=.map) >nul 2>&1
+    -del $(LIBNAME:.lib=.manifest) >nul 2>&1
+    -del $(DLLNAME) >nul 2>&1
+    -del $(DBGPATH)$(LIBBASE).pdb >nul 2>&1
+    -del $(EXENAME) >nul 2>&1
+    -del $(DBGPATH)$(EXEBASE).pdb >nul 2>&1
+    -del $(LIBPATH)$(EXEBASE).manifest >nul 2>&1
+    -del $(CLEANFILES) >nul 2>&1
+
+        -mkdir $(HY_BIN)
+
+# C rules
+{$(HY_PLATFORM)/}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_ARCH)/}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_OS)/}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)additional/}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{.}.c{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(OSS_DIST)}.c{$(HY_BIN)}.obj: # for zlib_dist / fdlibm_dist
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+# C++ rules
+{$(HY_ARCH)/}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(HY_OS)/}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{.}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+# assembler rules
+{$(HY_PLATFORM)/}.asm{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(HY_ARCH)/}.asm{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(HY_OS)/}.asm{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{$(SHAREDSUB)}.asm{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+{.}.asm{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<

Added: harmony/enhanced/java/trunk/common_resources/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/rules.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/rules.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/rules.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,159 @@
+# 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
+#
+
+CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CFLAGS) $(WARNFLAGS)
+CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CXXFLAGS) $(WARNFLAGS)
+EXPFILE = $(HY_BIN)$(notdir $(basename $(DLLNAME))).exp
+
+BUILDFILES := $(addprefix $(HY_BIN),$(BUILDFILES))
+
+ifneq ($(HY_OS),zos)
+# Convert $(LIBPATH)libblah.so to -L$(LIBPATH) ... -lblah, also for $(DLLPATH)
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) -L$(LIBPATH) -L$(DLLPATH) \
+  $(patsubst $(LIBPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, \
+    $(patsubst $(DLLPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, $(MDLLIBFILES))) \
+  $(MDLLIBSUFFIX)
+else
+# Do not change on zOS
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX)
+endif
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME) $(HDKINCLUDES)
+
+CFLAGS += $(DEPFLAGS)
+CXXFLAGS += $(DEPFLAGS)
+-include $(BUILDFILES:.o=.d)
+
+$(LIBNAME): $(BUILDFILES)
+	@mkdir -p $(@D)
+	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
+	$(RANLIB) $@
+
+$(EXPFILE): exports.txt
+ifeq ($(HY_OS),aix)
+	cp $< $@
+else
+	echo "$(EXPNAME) {" >$@
+	echo "  global :" >>$@
+	sed -e's/^/    /;/#/!s/$$/;/' <$< >>$@
+	echo "  local : *;" >>$@
+	echo "};" >>$@
+endif
+
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
+	@mkdir -p $(@D)
+	$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
+	$(BUILDFILES) $(MDLLIBARGS) $(OSLIBS)
+ifeq ($(HY_CAN_LINK_DEBUG),yes)
+	objcopy --only-keep-debug $@ $@.dbg
+	strip --strip-debug --strip-unneeded $@
+	( cd $(@D) && objcopy --add-gnu-debuglink=$(@F).dbg $(@F) )
+	-mkdir -p $(DBGPATH)
+	test "$@.dbg" = "$(DBGPATH)$(@F).dbg" || \
+		mv $@.dbg $(DBGPATH)$(@F).dbg
+endif
+ifeq ($(HY_OS),zos)
+	mv $(notdir $(basename $(DLLNAME)))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
+endif
+
+$(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
+	@mkdir -p $(@D)
+	$(CC) $(VMLINK) $(EXELDFLAGS) \
+	$(BUILDFILES) $(MDLLIBARGS) -o $@ $(OSLIBS) \
+	$(EXERPATHPREFIX) -L$(DLLPATH)
+	@chmod 755 $(EXENAME)
+
+clean:
+	-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \
+	       $(CLEANFILES) $(DBGPATH)$(notdir $(DLLNAME)).dbg
+
+# C rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)additional/%.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.c
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(OSS_DIST)%.c # for zlib_dist / fdlibm_dist
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+# C++ rules
+$(HY_BIN)%.o: $(HY_ARCH)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)$(HY_ARCH)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+
+# assembler rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.s
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.s
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.s
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.s
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: %.s
+	@mkdir -p $(@D)
+	$(AS) $(ASFLAGS) -o $@ $<
+

Modified: harmony/enhanced/java/trunk/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/common_resources/make/depends.properties Tue Oct 26 07:13:24 2010
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${base.dep.dir}/jars
-depends.oss=${base.dep.dir}/oss
+depends.jars=${hy.depends}/jars
+depends.oss=${hy.depends}/oss
 
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 eclipse.base=http://download.eclipse.org/eclipse/downloads/drops
@@ -44,7 +44,7 @@ icuhdr=${depends.oss}/icu4c/icu4c-3.4-ha
 icuhdr.url=${depends.url}/oss/icu4c-3.4-harmony-includes.zip
 icuhdr.md5=46dbe39e5f6c4ea206a9daad9e29f8b0
 
-icudll=${base.dep.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
+icudll=${hy.depends}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
 icuuc.linkname@windows@=icuuc.lib
 icuuc.linkname@unix@=libicuuc.so.34
@@ -78,13 +78,7 @@ xerces.zip=${xerces.dir}/xerces.zip
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.10.0.zip
 xerces.md5=8da14a7b2848eff131b7cc10668887e8
 
-bcprov.ver=bcprov-jdk15-138
-bcprov.dir=${depends.jars}/${bcprov.ver}
-bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
-bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.noidea.jar
-bcprov.md5=7e2cf5f39012b303b4246e33a66bf078
-
-msvcr.dir.x86=${depends.dir}/libs/windows.x86
+msvcr.dir.x86=${hy.depends}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
 # This is the md5 hash for the VS2003 version, 7.10.3052.4
@@ -92,7 +86,7 @@ msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d9
 # This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
 msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
 
-msvcp.dir.x86=${depends.dir}/libs/windows.x86
+msvcp.dir.x86=${hy.depends}/libs/windows.x86
 msvcp.dll.x86=${msvcr.dir.x86}/msvcp71.dll
 msvcp.url.x86=file:///${hyenv.SystemRoot}/system32/msvcp71.dll
 # This is the md5 hash for the VS2003 version, 7.10.3077.0
@@ -100,13 +94,13 @@ msvcp_VS2003.md5.x86=561fa2abb31dfa8fab7
 # This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
 msvcp_VS2003SP1.md5.x86=a94dc60a90efd7a35c36d971e3ee7470
 
-msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcr.dir.x86_64=${hy.depends}/libs/windows.x86_64
 msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
 msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
 # VS2005 version 8.00.50727.42
 msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
 
-msvcp.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcp.dir.x86_64=${hy.depends}/libs/windows.x86_64
 msvcp.dll.x86_64=${msvcp.dir.x86_64}/msvcp80.dll
 msvcp.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll
 # VS2005 version 8.00.50727.42
@@ -119,26 +113,6 @@ mx4j.md5=443bd83ee36414de4b8fc5722b038b0
 mx4j.jar=${mx4j.dir}/mx4j.jar
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
 
-yoko.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-SNAPSHOT/yoko-spec-corba-1.0-20080304.193341-1.jar
-yoko.md5=884ac35840a92d13efa155812bfe54a9
-
-yoko-core.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-core.jar=${yoko.dir}/yoko-core.jar
-yoko-core.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-core/1.0-SNAPSHOT/yoko-core-1.0-20080304.193341-1.jar
-yoko-core.md5=03638ebf8c1da647ad64412a2c5fb2f4
-
-yoko-rmi-impl.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
-yoko-rmi-impl.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-impl/1.0-SNAPSHOT/yoko-rmi-impl-1.0-20080304.193341-1.jar
-yoko-rmi-impl.md5=4a45c7a0308227a46fd3ef675c6fde6c
-
-yoko-rmi-spec.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
-yoko-rmi-spec.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-spec/1.0-SNAPSHOT/yoko-rmi-spec-1.0-20080304.193341-1.jar
-yoko-rmi-spec.md5=8ef16849448ecccabc0f1aac8b840e9c
-
 # bcel is needed by yoko-rmi
 bcel.version=5.2
 bcel.base=bcel-${bcel.version}
@@ -161,23 +135,23 @@ servlet-api.md5=c27c02fb0a00cc3a7d05ea99
 servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
 awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
-awtdeps.dir.x86=${depends.dir}/libs/windows.x86
+awtdeps.dir.x86=${hy.depends}/libs/windows.x86
 awtdeps.tar.x86=${awtdeps.dir.x86}/swing_awt_deps_winxp_2006-09-28.tgz
 awtdeps.url.x86=${awtdeps.base.x86}swing_awt_deps_winxp_2006-09-28.tgz
 awtdeps.md5.x86=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir.x86=${depends.dir}/libs/build
+awtdeps.extract.dir.x86=${hy.depends}/libs/build
 awtdeps.testfile.x86=${awtdeps.extract.dir.x86}/winxp_2006-09-28.txt
 
 awtdeps.base.x86_64=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.dir.x86_64=${depends.dir}/libs/windows.x86_64
+awtdeps.dir.x86_64=${hy.depends}/libs/windows.x86_64
 awtdeps.tar.x86_64=${awtdeps.dir.x86_64}/swing_awt_deps_win64_2007-02-08.tgz
 awtdeps.url.x86_64=${awtdeps.base.x86_64}swing_awt_deps_win64_2007-02-08.tgz
 awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
+awtdeps.extract.dir.x86_64=${hy.depends}/libs/build
 awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/win64_2007-02-08.txt
 
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
+dejavu-fonts.dir=${hy.depends}/dejavu-fonts
+dejavu-fonts.fonts.dir=${hy.depends}/dejavu-fonts/dejavu-ttf-2.18
 dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
 dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
 dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e

Modified: harmony/enhanced/java/trunk/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/depends.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/depends.xml Tue Oct 26 07:13:24 2010
@@ -38,126 +38,17 @@
       </filterchain>
     </loadproperties>
 
-    <macrodef name="poll-modules" 
-        description="directory-based macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="${build.module}"/>
-        <attribute name="excludes" default="${exclude.module}"/>
-        <attribute name="antfile" default="*.xml"/>
-        <sequential>
-            <!-- convert dirset pattern to fileset pattern-->
-            <property name="@{dir}.loc" location="@{dir}"/>
-            <pathconvert property="list.@{dir}.@{target}" 
-                pathsep="${file.separator}@{antfile}," setonempty="no">
-                <path>
-                    <dirset dir="@{dir}"
-                            includes="@{includes}"
-                            excludes="@{excludes}">
-                        <exclude name=".*" />
-                    </dirset>
-                </path>
-                <map from="${@{dir}.loc}${file.separator}" to=""/>
-            </pathconvert>
-            <!-- append antfile suffix to last item in the list, if any -->
-            <condition property="poll.@{dir}.@{target}"
-                value="${list.@{dir}.@{target}}${file.separator}@{antfile}" 
-                else="">
-                <isset property="list.@{dir}.@{target}"/>
-            </condition>
-            <poll-build target="@{target}" dir="@{dir}" 
-                includes="${poll.@{dir}.@{target}}"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="poll-build"
-        description="plain-filter macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="**/*.xml"/>
-        <attribute name="excludes" default=""/>
-        <sequential>
-            <echo message="polling @{includes}"/>
-            <subant target="@{target}">
-                <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
-                    <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
-                </fileset>
-            </subant>
-        </sequential>
-    </macrodef>
-
-    <target name="fetch">
-        <fetch dep="${dependency}"/>
-    </target>
-    
-    <macrodef name="fetch">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <mkdir dir="${@{dep}.dir}"/>
-            <download-one-file dest="${@{dep}}" 
-                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
-            <unzip-one-file dep="@{dep}"/>
-        </sequential>
-    </macrodef>
-    
-    <target name="-really-unzip" unless="unzipped" if="unzip.path">
-        <tempfile destdir="${dest}" property="tmp"/>
-        <unzip src="${src}" dest="${tmp}" >
-            <patternset includes="${unzip.path}"/>
-        </unzip>
-        <touch>
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </touch>
-        <move todir="${dest}" flatten="yes" failonerror="no">
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </move>
-        <delete dir="${tmp}" />
-    </target>
-    
-    <macrodef name="unzip-one-file">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <!-- quite tricky way to detect if unzip operation is pending,
-                still not very robust ...
-                Life could be simpler if unzip supported nested mappers
-            -->
-            <basename file="${@{dep}}" property="@{dep}.basename"/>
-            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
-            <pathconvert property="@{dep}.matching.list" setonempty="no">
-                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
-            </pathconvert>
-            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
-                <path>
-                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
-                        <depend targetdir="${@{dep}.dir}">
-                            <mapper type="merge" to="${@{dep}.basename}"/>
-                        </depend>
-                    </fileset>
-                </path>
-            </pathconvert>
-            <condition property="@{dep}.unzipped">
-                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
-                <!--uptodate srcfile="${@{dep}}"
-                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
-            </condition>
+    <loadproperties srcfile="${basedir}/make/depends.properties">
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+            <param type="token" name="${hy.arch}" value=""/>
+            <param type="token" name="${hy.os.family}" value=""/>
+            <param type="token" name="${hy.platform}" value=""/>
+            <param type="token" name="${hy.platform.variant}" value=""/>
+        </filterreader>
+      </filterchain>
+    </loadproperties>
 
-            <antcall target="-really-unzip">
-                <param name="src" value="${@{dep}}" />
-                <param name="dest" value="${@{dep}.dir}" />
-                <propertyset>
-                  <propertyref prefix="@{dep}.unzip"/>
-                  <globmapper from="@{dep}.*" to="*"/>
-                </propertyset>
-            </antcall>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="download-one-file">
         <attribute name="src" />
         <attribute name="dest" />
@@ -238,6 +129,32 @@ than the Apache License v2.
         </sequential>
     </macrodef>
 
+    <macrodef name="check-os-file">
+        <attribute name="src" />
+        <attribute name="message" />
+        <sequential>
+            <echo level="info">Checking for system file @{src}</echo>
+            <available file="@{src}" type="file"
+                       property="@{src}.exists" />
+            <fail>
+                <condition>
+                    <not>
+                        <isset property="@{src}.exists" />
+                    </not>
+                </condition>
+...
+
+Missing dependency.  The system file:
+
+  @{src}
+
+is missing.
+
+@{message}
+            </fail>
+        </sequential>
+    </macrodef>
+
     <macrodef name="check-one-link">
         <attribute name="src" />
         <attribute name="dest" />
@@ -284,15 +201,76 @@ But @{src} doesn't exist.
         <symlink resource="${src}" link="${dest}" />
     </target>
 
+    <target name="fetch">
+        <fetch dep="${dependency}"/>
+    </target>
+    
+    <macrodef name="fetch">
+        <attribute name="dep" />
+        <sequential>
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <mkdir dir="${@{dep}.dir}"/>
+            <download-one-file dest="${@{dep}}" 
+                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
+            <unzip-one-file dep="@{dep}"/>
+        </sequential>
+    </macrodef>
     
-    <!--macrodef name="chksum">
-        <attribute name="file" />
-        <attribute name="type" default="md5" />
+    <target name="-really-unzip" unless="unzipped" if="unzip.path">
+        <tempfile destdir="${dest}" property="tmp"/>
+        <unzip src="${src}" dest="${tmp}" >
+            <patternset includes="${unzip.path}"/>
+        </unzip>
+        <touch>
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </touch>
+        <move todir="${dest}" flatten="yes" failonerror="no">
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </move>
+        <delete dir="${tmp}" />
+    </target>
+
+    <macrodef name="unzip-one-file">
+        <attribute name="dep" />
         <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}"
-                      algorithm="@{type}" />
-            <echo file="@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}${line.separator}" />
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <!-- quite tricky way to detect if unzip operation is pending,
+                still not very robust ...
+                Life could be simpler if unzip supported nested mappers
+            -->
+            <basename file="${@{dep}}" property="@{dep}.basename"/>
+            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
+            <pathconvert property="@{dep}.matching.list" setonempty="no">
+                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
+            </pathconvert>
+            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
+                <path>
+                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
+                        <depend targetdir="${@{dep}.dir}">
+                            <mapper type="merge" to="${@{dep}.basename}"/>
+                        </depend>
+                    </fileset>
+                </path>
+            </pathconvert>
+            <condition property="@{dep}.unzipped">
+                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
+                <!--uptodate srcfile="${@{dep}}"
+                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
+            </condition>
+
+            <antcall target="-really-unzip">
+                <param name="src" value="${@{dep}}" />
+                <param name="dest" value="${@{dep}.dir}" />
+                <propertyset>
+                  <propertyref prefix="@{dep}.unzip"/>
+                  <globmapper from="@{dep}.*" to="*"/>
+                </propertyset>
+            </antcall>
         </sequential>
-    </macrodef-->
+    </macrodef>
+
 </project>

Modified: harmony/enhanced/java/trunk/common_resources/make/platform.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/platform.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/platform.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/platform.xml Tue Oct 26 07:13:24 2010
@@ -183,7 +183,29 @@
         <isset property="is.ppc32" />
     </condition>
     <property name="hy.arch" value="${os.arch}" />
-    
+
+    <condition property="hy.arch.family" value="x86">
+        <or>
+            <isset property="is.x86" />
+            <isset property="is.x86_64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="ia64">
+        <isset property="is.ia64" />
+    </condition>
+    <condition property="hy.arch.family" value="ppc">
+        <or>
+            <isset property="is.ppc32" />
+            <isset property="is.ppc64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="s390">
+        <or>
+            <isset property="is.s390" />
+            <isset property="is.s390x" />
+        </or>
+    </condition>
+
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
     <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
@@ -254,8 +276,19 @@
         <or>
             <isset property="is.aix"/>
             <isset property="is.freebsd"/>
+            <isset property="is.zos"/>
         </or>
     </condition>
     <property name="make.command" value="make" />
 
+    <condition property="make.arg" value="/nologo">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.arg" value="-r" />
+
+    <condition property="make.suffix" value="mak">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.suffix" value="mk" />
+
 </project>



Mime
View raw message