Bug 549585 - Contribute Chromium support to SWT
- Remove hard-coded version from Cargo.toml
Change-Id: I04d02f53a923a0f62d0193ceda555d79e2391c17
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
diff --git a/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml b/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml
index 65f73ec..b061f8b 100644
--- a/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml
+++ b/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_swt/Cargo.toml
@@ -4,7 +4,7 @@
authors = ["Equo <https://www.equoplatform.com/>", "Guillermo Zunino <guillez@gmail.com>"]
[lib]
-name = "chromium_swt_4936r8"
+name = "chromium_swt"
crate-type = ["dylib"]
path = "src/lib.rs"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
index a1b1c16..5012ffe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
@@ -43,7 +43,7 @@
CHROMIUM_LIB = lib$(CHROMIUM_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib
CHROMIUM_OBJECTS = chromiumlib.o chromiumlib_structs.o chromiumlib_custom.o chromiumlib_stats.o
CHROMIUM_CFLAGS = -I $(CHROMIUM_HEADERS)
-CHROMIUM_LFLAGS = -bundle $(ARCHS) -lchromium_swt_${SWT_VERSION} -L$(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
+CHROMIUM_LFLAGS = -bundle $(ARCHS) -lchromium_swt -L$(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
all: $(SWT_LIB) $(SWTPI_LIB) $(AWT_LIB)
@@ -84,11 +84,11 @@
cd chromium_swt && cargo build --release
mkdir -p $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/chromium_subp-$(SWT_VERSION).app/Contents/MacOS/
install_name_tool -change '@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework' '@loader_path/../../../Chromium Embedded Framework.framework/Chromium Embedded Framework' chromium_subp/target/release/chromium_subp
- install_name_tool -change '@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework' '@loader_path/Chromium Embedded Framework.framework/Chromium Embedded Framework' chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).dylib
- install_name_tool -id '@loader_path/libchromium_swt_$(SWT_VERSION).dylib' chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).dylib
- strip -r -u chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).dylib
+ install_name_tool -change '@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework' '@loader_path/Chromium Embedded Framework.framework/Chromium Embedded Framework' chromium_swt/target/release/libchromium_swt.dylib
+ install_name_tool -id '@loader_path/libchromium_swt.dylib' chromium_swt/target/release/libchromium_swt.dylib
+ strip -r -u chromium_swt/target/release/libchromium_swt.dylib
cp chromium_subp/target/release/chromium_subp $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/chromium_subp-$(SWT_VERSION).app/Contents/MacOS/
- cp chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).dylib $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
+ cp chromium_swt/target/release/libchromium_swt.dylib $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/libchromium_swt_$(SWT_VERSION).dylib
chromium_install: make_chromium
strip -r -u $(CHROMIUM_LIB)
cp $(CHROMIUM_LIB) "$(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 5e452ae..f33363c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -96,7 +96,7 @@
WEBKITCFLAGS += `pkg-config --cflags webkit2gtk-4.0`
endif
-CHROMIUMLIBS = -lchromium_swt_${SWT_VERSION} -L$(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver) -Wl,--disable-new-dtags,-rpath,"\$$ORIGIN"
+CHROMIUMLIBS = -lchromium_swt -L$(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver) -Wl,--disable-new-dtags,-rpath,"\$$ORIGIN"
CHROMIUMCFLAGS = -I$(CHROMIUM_HEADERS)
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
@@ -294,7 +294,7 @@
cd chromium_swt && cargo build --release
mkdir -p $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
cp chromium_subp/target/release/chromium_subp $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/chromium_subp-$(SWT_VERSION)
- cp chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).so $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
+ cp chromium_swt/target/release/libchromium_swt.so $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/libchromium_swt_$(SWT_VERSION).so
chromium_install: chromium
cp $(CHROMIUM_LIB) $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)
#
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index a8e3078..dd0af28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -43,7 +43,7 @@
CHROMIUM_PREFIX = swt-chromium
CHROMIUM_LIB = $(CHROMIUM_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
-CHROMIUM_LIBS = $(CHROMIUM_TARGET)\chromium_swt_$(SWT_VERSION).dll.lib
+CHROMIUM_LIBS = $(CHROMIUM_TARGET)\chromium_swt.dll.lib
CHROMIUM_OBJS = chromiumlib.obj chromiumlib_stats.obj chromiumlib_custom.obj chromiumlib_structs.obj
WGL_PREFIX = swt-wgl
@@ -152,7 +152,7 @@
cd chromium_swt && cargo build --release
mkdir $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)
copy chromium_subp\target\release\chromium_subp.exe $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)\chromium_subp-$(SWT_VERSION).exe
- copy chromium_swt\target\release\chromium_swt_$(SWT_VERSION).dll $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)
+ copy chromium_swt\target\release\chromium_swt.dll $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)\chromium_swt_$(SWT_VERSION).dll
chromium_install: make_chromium
copy $(CHROMIUM_PREFIX)*.dll "$(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)"
