Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Barbero2015-09-25 11:40:16 -0400
committerArun Thondapu2015-12-18 07:08:51 -0500
commit15d56969726892d8f960f4b0562575446c550957 (patch)
treefd2e7808559afcdbc66a42fd5f1175f18fb26809
parentb2d5cd9b7aee527968d3382eff1bb7e64590fc27 (diff)
downloadrt.equinox.framework-15d56969726892d8f960f4b0562575446c550957.tar.gz
rt.equinox.framework-15d56969726892d8f960f4b0562575446c550957.tar.xz
rt.equinox.framework-15d56969726892d8f960f4b0562575446c550957.zip
Bug 383545 - Rename library/carbon to library/cocoa
Change-Id: Ibf3be14f750de816825000a2f1c8d17fbe8ed249 Signed-off-by: Mikael Barbero <mikael@eclipse.org>
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/carbon/make_carbon.mak93
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/.cvsignore (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/.cvsignore)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/build.sh)57
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/build.xml)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbon.c (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbon.c)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonCommon.c (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonCommon.c)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonMain.c (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonMain.c)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseMain.c (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/eclipseMain.c)0
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak (renamed from features/org.eclipse.equinox.executable.feature/library/carbon/make_cocoa.mak)26
-rw-r--r--features/org.eclipse.equinox.executable.feature/pom.xml4
10 files changed, 32 insertions, 148 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/make_carbon.mak b/features/org.eclipse.equinox.executable.feature/library/carbon/make_carbon.mak
deleted file mode 100644
index 34843b739..000000000
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/make_carbon.mak
+++ /dev/null
@@ -1,93 +0,0 @@
-#**********************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Kevin Cornell (Rational Software Corporation)
-#**********************************************************************
-include ../make_version.mak
-# Makefile for creating the Carbon eclipse launcher program.
-
-# This makefile expects the following environment variables set:
-#
-# PROGRAM_OUTPUT - the filename of the output executable
-# DEFAULT_OS - the default value of the "-os" switch
-# DEFAULT_OS_ARCH - the default value of the "-arch" switch
-# DEFAULT_WS - the default value of the "-ws" switch
-
-#default value for PROGRAM_OUTPUT
-ifeq ($(PROGRAM_OUTPUT),)
- PROGRAM_OUTPUT=eclipse
-endif
-PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
-
-# Define the object modules to be compiled and flags.
-MAIN_OBJS = eclipseMain.o eclipseCarbonMain.o
-COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseCarbonCommon.o
-DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o eclipseShm.o NgImageData.o NgWinBMPFileFormat.o NgCommon.o
-
-EXEC = $(PROGRAM_OUTPUT)
-DLL = $(PROGRAM_LIBRARY)
-LIBS = -framework Carbon
-ARCHS = -arch i386 -arch ppc
-CFLAGS = -O -s \
- -mmacosx-version-min=10.3 \
- -Wall \
- $(ARCHS) \
- -DMACOSX \
- -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
- -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
- -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
- -I.. -I../motif -I/System/Library/Frameworks/JavaVM.framework/Headers
-
-all: $(EXEC) $(DLL)
-
-eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
- $(CC) $(CFLAGS) -c ../eclipse.c -o $@
-
-eclipseCarbonMain.o : eclipseCarbonMain.c
- $(CC) $(CFLAGS) -c eclipseCarbonMain.c -o $@
-
-eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h eclipseMain.c ../eclipseMain.c
- $(CC) $(CFLAGS) -c eclipseMain.c -o $@
-
-eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
- $(CC) $(CFLAGS) -c ../eclipseJNI.c -o $@
-
-eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
- $(CC) $(CFLAGS) -c ../eclipseUtil.c -o $@
-
-eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
- $(CC) $(CFLAGS) -c ../eclipseConfig.c -o $@
-
-eclipseCommon.o: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c
- $(CC) $(CFLAGS) -c ../eclipseCommon.c -o $@
-
-eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
- $(CC) $(CFLAGS) -c ../eclipseShm.c -o $@
-
-NgCommon.o: ../motif/NgCommon.c
- $(CC) $(CFLAGS) -c ../motif/NgCommon.c -o $@
-
-NgWinBMPFileFormat.o: ../motif/NgWinBMPFileFormat.c
- $(CC) $(CFLAGS) -c ../motif/NgWinBMPFileFormat.c -o $@
-
-NgImageData.o: ../motif/NgImageData.c
- $(CC) $(CFLAGS) -c ../motif/NgImageData.c -o $@
-
-$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
- $(CC) -o $(EXEC) $(ARCHS) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
-
-$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
- $(CC) -bundle -o $(DLL) $(ARCHS) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
-
-install: all
- cp $(EXEC) $(PPC_OUTPUT_DIR)
- cp $(EXEC) $(X86_OUTPUT_DIR)
- rm -f $(EXEC) $(OBJS)
-
-clean:
- rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/.cvsignore b/features/org.eclipse.equinox.executable.feature/library/cocoa/.cvsignore
index f0fdae47c..f0fdae47c 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/.cvsignore
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/.cvsignore
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
index ac923d2ff..3fda6e820 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
@@ -3,9 +3,9 @@
# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
+# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
+#
# Contributors:
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
@@ -27,12 +27,9 @@ cd `dirname $0`
# Define default values for environment variables used in the makefiles.
programOutput="eclipse"
defaultOS="macosx"
-defaultOSArch="x86"
-defaultWS="carbon"
-makefile="make_carbon.mak"
-if [ "$OS" = "" ]; then
- OS=`uname -s`
-fi
+defaultOSArch="x86_64"
+defaultWS="cocoa"
+makefile="make_cocoa.mak"
# Parse the command line arguments and override the default values.
extraArgs=""
@@ -55,46 +52,30 @@ while [ "$1" != "" ]; do
shift
done
+echo "build $defaultOSArch"
+
# Set up environment variables needed by the makefiles.
PROGRAM_OUTPUT="$programOutput"
DEFAULT_OS="$defaultOS"
DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
EXEC_DIR=../../../../../rt.equinox.binaries/org.eclipse.equinox.executable
-PPC_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/ppc/Eclipse.app/Contents/MacOS"
-X86_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86/Eclipse.app/Contents/MacOS"
-X86_64_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/x86_64/Eclipse.app/Contents/MacOS"
+PROGRAM_OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch/Eclipse.app/Contents/MacOS"
-if [ "$DEFAULT_WS" == "cocoa" ]; then
- makefile="make_cocoa.mak"
- export MACOSX_DEPLOYMENT_TARGET=10.5
+# /System/Library/Frameworks/JavaVM.framework/Headers does not exist anymore on Yosemite
+if [ -e /System/Library/Frameworks/JavaVM.framework/Headers ]; then
+ JAVA_HEADERS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
else
- export MACOSX_DEPLOYMENT_TARGET=10.3
+ JAVA_HEADERS="-I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin"
fi
-if [ "$DEFAULT_OS_ARCH" == "x86_64" ]; then
- echo "build x86_64"
- ARCHS="-arch x86_64"
- PROGRAM_OUTPUT_DIR=$X86_64_OUTPUT_DIR
- DEFAULT_OS_ARCH="x86_64"
-else
- echo "build x86 and ppc"
- ARCHS="-arch i386 -arch ppc"
- PROGRAM_OUTPUT_DIR=$X86_OUTPUT_DIR
-fi
-
-export PPC_OUTPUT_DIR X86_OUTPUT_DIR X86_64_OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS ARCHS PROGRAM_OUTPUT_DIR
+export PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS ARCHS PROGRAM_OUTPUT_DIR JAVA_HEADERS
-# If the OS is supported (a makefile exists)
-if [ "$makefile" != "" ]; then
- if [ "$extraArgs" != "" ]; then
- make -f $makefile $extraArgs
- else
- echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
- make -f $makefile clean
- make -f $makefile all
- make -f $makefile install
- fi
+if [ "$extraArgs" != "" ]; then
+ make -f $makefile $extraArgs
else
- echo "Unknown OS ($OS) -- build aborted"
+ echo "Building $defaultOS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
+ make -f $makefile clean
+ make -f $makefile all
+ make -f $makefile install
fi
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
index 9561ac508..9561ac508 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbon.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbon.c
index 61bdb8eb3..61bdb8eb3 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbon.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbon.c
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonCommon.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonCommon.c
index 75369f148..75369f148 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonCommon.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonCommon.c
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonMain.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonMain.c
index 51cafc275..51cafc275 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseCarbonMain.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCarbonMain.c
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseMain.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseMain.c
index c0eaffa13..c0eaffa13 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/eclipseMain.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseMain.c
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/make_cocoa.mak b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak
index 868c34bbf..0d267a094 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/make_cocoa.mak
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak
@@ -2,14 +2,14 @@
# Copyright (c) 2000, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
+# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#
+# Contributors:
# Kevin Cornell (Rational Software Corporation)
-#**********************************************************************
+#**********************************************************************
include ../make_version.mak
-# Makefile for creating the Carbon eclipse launcher program.
+# Makefile for creating the Cocoa eclipse launcher program.
# This makefile expects the following environment variables set:
#
@@ -27,26 +27,22 @@ PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
# Define the object modules to be compiled and flags.
MAIN_OBJS = eclipseMain.o eclipseCarbonMain.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseCarbonCommon.o
-DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o eclipseShm.o
+DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o eclipseShm.o
#NgImageData.o NgWinBMPFileFormat.o NgCommon.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
LIBS = -framework Cocoa
-ifeq ($(ARCHS),)
-ARCHS = -arch i386 -arch ppc
-endif
-
CFLAGS = -O -s \
-Wall \
-DCOCOA -xobjective-c \
- $(ARCHS) \
+ -arch x86_64 \
-DMACOSX \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
- -I.. -I../motif -I/System/Library/Frameworks/JavaVM.framework/Headers
+ -I.. -I../motif $(JAVA_HEADERS)
all: $(EXEC) $(DLL)
@@ -56,15 +52,15 @@ eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
eclipseCarbonMain.o : eclipseCarbonMain.c
$(CC) $(CFLAGS) -c eclipseCarbonMain.c -o $@
-eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h eclipseMain.c ../eclipseMain.c
+eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h eclipseMain.c ../eclipseMain.c
$(CC) $(CFLAGS) -c eclipseMain.c -o $@
-
+
eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c ../eclipseJNI.c -o $@
eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseUtil.c -o $@
-
+
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseConfig.c -o $@
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
index 9d37a9bd3..1bf2187ac 100644
--- a/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -410,7 +410,7 @@
<phase>generate-resources</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse"/>
+ <ant antfile="build.xml" dir="library/cocoa/" target="build_eclipse"/>
</target>
</configuration>
<goals>
@@ -422,7 +422,7 @@
<phase>clean</phase>
<configuration>
<target>
- <ant antfile="build.xml" dir="library/carbon/" target="clean"/>
+ <ant antfile="build.xml" dir="library/cocoa/" target="clean"/>
</target>
</configuration>
<goals>

Back to the top