diff options
| author | Lakshmi Shanmugam | 2020-07-23 05:08:35 +0000 |
|---|---|---|
| committer | Lakshmi Shanmugam | 2020-07-23 05:08:35 +0000 |
| commit | b95adfc813d504c9566038b7fc88fa09772d19cf (patch) | |
| tree | 46d48c77ccfa49ccb79e2b6cbffe6dc2cd58bafa | |
| parent | 72c4e95e6cdb88401ae8bf48f125ba8e1f89856e (diff) | |
| download | eclipse.platform.swt-b95adfc813d504c9566038b7fc88fa09772d19cf.tar.gz eclipse.platform.swt-b95adfc813d504c9566038b7fc88fa09772d19cf.tar.xz eclipse.platform.swt-b95adfc813d504c9566038b7fc88fa09772d19cf.zip | |
Bug 565434 - Error launching Chromium style browser
Put version information back in Cargo.toml
Reverting rest of the change -
https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/166513
Change-Id: If464271803c6b0aa9d14a143cbc6642dab0b2a87
4 files changed, 8 insertions, 8 deletions
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 b061f8b041..138d03d6fd 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 @@ version = "59.0.0" authors = ["Equo <https://www.equoplatform.com/>", "Guillermo Zunino <guillez@gmail.com>"]
[lib]
-name = "chromium_swt"
+name = "chromium_swt_4936r9"
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 ce02de5949..a1b1c16686 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 @@ -84,11 +84,11 @@ chromium_cargo: 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.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 + 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 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.dylib $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/libchromium_swt_$(SWT_VERSION).dylib + cp chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).dylib $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver) 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 5e923a6349..5e452ae7a4 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 @@ -294,7 +294,7 @@ chromium_cargo: 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.so $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver)/libchromium_swt_$(SWT_VERSION).so + cp chromium_swt/target/release/libchromium_swt_$(SWT_VERSION).so $(CHROMIUM_OUTPUT_DIR)/chromium-$(cef_ver) 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 dd0af28373..a8e3078eac 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 @@ AWT_OBJS = swt_awt.obj CHROMIUM_PREFIX = swt-chromium CHROMIUM_LIB = $(CHROMIUM_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll -CHROMIUM_LIBS = $(CHROMIUM_TARGET)\chromium_swt.dll.lib +CHROMIUM_LIBS = $(CHROMIUM_TARGET)\chromium_swt_$(SWT_VERSION).dll.lib CHROMIUM_OBJS = chromiumlib.obj chromiumlib_stats.obj chromiumlib_custom.obj chromiumlib_structs.obj WGL_PREFIX = swt-wgl @@ -152,7 +152,7 @@ chromium_cargo: 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.dll $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)\chromium_swt_$(SWT_VERSION).dll + copy chromium_swt\target\release\chromium_swt_$(SWT_VERSION).dll $(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver) chromium_install: make_chromium copy $(CHROMIUM_PREFIX)*.dll "$(CHROMIUM_OUTPUT_DIR)\chromium-$(cef_ver)" |