diff --git a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF index bdc77afe99d..eeab906b122 100644 --- a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true -Bundle-Version: 5.10.1.qualifier +Bundle-Version: 5.10.100.qualifier Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core.native/plugin.properties b/core/org.eclipse.cdt.core.native/plugin.properties index 1282303b7f8..40d7fc25cea 100755 --- a/core/org.eclipse.cdt.core.native/plugin.properties +++ b/core/org.eclipse.cdt.core.native/plugin.properties @@ -17,12 +17,8 @@ pluginName=C/C++ Development Tools Core Native Utilities providerName=Eclipse CDT fragmentName.linux = C/C++ Development Tools Core Native Utilities for Linux -fragmentName.linux.ppc = C/C++ Development Tools Core Native Utilities for Linux (ppc) -fragmentName.linux.ppc64 = C/C++ Development Tools Core Native Utilities for Linux (ppc64) fragmentName.linux.ppc64le = C/C++ Development Tools Core Native Utilities for Linux (ppc64le) -fragmentName.linux.x86 = C/C++ Development Tools Core Native Utilities for Linux (x86) fragmentName.linux.x86_64 = C/C++ Development Tools Core Native Utilities for Linux (x86_64) fragmentName.win32 = C/C++ Development Tools Core Native Utilities for Windows -fragmentName.win32.x86 = C/C++ Development Tools Core Native Utilities for Windows (x86) fragmentName.win32.x86_64 = C/C++ Development Tools Core Native Utilities for Windows (x86_64) fragmentName.macosx = C/C++ Development Tools Core Native Utilities for MacOS X diff --git a/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF b/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF index 005d1d17234..1a90e5ed722 100644 --- a/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF +++ b/native/org.eclipse.cdt.native.serial/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Serial Port Bundle-SymbolicName: org.eclipse.cdt.native.serial -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-Vendor: Eclipse CDT Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.cdt.serial diff --git a/native/org.eclipse.cdt.native.serial/jni/Makefile b/native/org.eclipse.cdt.native.serial/jni/Makefile index a6fd6961d5f..8c07bd926e2 100644 --- a/native/org.eclipse.cdt.native.serial/jni/Makefile +++ b/native/org.eclipse.cdt.native.serial/jni/Makefile @@ -24,9 +24,7 @@ CFLAGS += -fPIC -D_REENTRANT UNAME = $(shell uname) ifeq ($(UNAME),Linux) LIBS = \ - $(OS_DIR)/win32/x86/serial.dll \ $(OS_DIR)/win32/x86_64/serial.dll \ - $(OS_DIR)/linux/x86/libserial.so \ $(OS_DIR)/linux/x86_64/libserial.so else ifeq ($(UNAME),Darwin) @@ -34,7 +32,6 @@ LIBS = \ $(OS_DIR)/macosx/x86_64/libserial.jnilib else LIBS = \ - $(OS_DIR)/win32/x86/serial.dll \ $(OS_DIR)/win32/x86_64/serial.dll endif endif @@ -46,26 +43,14 @@ clean : rebuild: clean all -$(OS_DIR)/win32/x86/serial.dll: serial.c - mkdir -p $(dir $@) - i686-w64-mingw32-gcc -Wl,--kill-at -static-libgcc -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" -shared -o $@ serial.c - $(OS_DIR)/win32/x86_64/serial.dll: serial.c mkdir -p $(dir $@) x86_64-w64-mingw32-gcc -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" -shared -o $@ serial.c -$(OS_DIR)/linux/x86/libserial.so: serial.c - mkdir -p $(dir $@) - gcc -m32 $(CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(LDFLAGS) -shared -o $@ serial.c - $(OS_DIR)/linux/x86_64/libserial.so: serial.c mkdir -p $(dir $@) gcc -m64 $(CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(LDFLAGS) -shared -o $@ serial.c -$(OS_DIR)/linux/ppc64/libserial.so: serial.c - mkdir -p $(dir $@) - gcc -m64 $(CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(LDFLAGS) -shared -o $@ serial.c - $(OS_DIR)/linux/ppc64le/libserial.so: serial.c mkdir -p $(dir $@) gcc -m64 -mcpu=power8 $(CFLAGS) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(LDFLAGS) -shared -o $@ serial.c diff --git a/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so b/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so deleted file mode 100755 index 951d00daccd..00000000000 Binary files a/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so and /dev/null differ diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore b/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore deleted file mode 100644 index 141e13b4a72..00000000000 --- a/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/serial.exp -/serial.lib -/serial.pdb diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll deleted file mode 100755 index 039443b8d23..00000000000 Binary files a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll and /dev/null differ diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml index ccc05480d93..66e66bc508f 100644 --- a/native/org.eclipse.cdt.native.serial/pom.xml +++ b/native/org.eclipse.cdt.native.serial/pom.xml @@ -23,7 +23,7 @@ ../../pom.xml - 1.1.100-SNAPSHOT + 1.1.200-SNAPSHOT org.eclipse.cdt.native.serial eclipse-plugin