[[ CEF ]] Copy render process after it's built

montegoulding · montegoulding · commit f2ec006e7e6e · 2019-06-07T06:39:18.000+10:00
(cherry picked from commit 0147355)
diff --git a/libbrowser/libbrowser.gyp b/libbrowser/libbrowser.gyp
@@ -177,6 +177,38 @@
 						],
 					},
 				],
+				
+				[
+					'OS == "win"',
+					{	
+						'copies':
+						[
+							{
+								'destination':'<(PRODUCT_DIR)/Externals/CEF/',
+								'files':
+								[
+									'<(PRODUCT_DIR)/libbrowser-cefprocess.exe',
+								],
+							},
+						],
+					},
+				],
+				
+				[
+					'OS == "linux"',
+					{	
+						'copies':
+						[
+							{
+								'destination':'<(PRODUCT_DIR)/Externals/CEF/',
+								'files':
+								[
+									'<(PRODUCT_DIR)/libbrowser-cefprocess',
+								],
+							},
+						],
+					},
+				],
 			],
 			
 			'direct_dependent_settings':
@@ -278,17 +310,6 @@
                             [
                                 'toolset_os == "win"',
                                 {	
-                                    'copies':
-                                    [
-                                        {
-                                            'destination':'<(PRODUCT_DIR)/CEF/',
-                                            'files':
-                                            [
-                                                '<(PRODUCT_DIR)/libbrowser-cefprocess.exe',
-                                            ],
-                                        },
-                                    ],
-
                                     'library_dirs':
                                     [
                                         '../prebuilt/unpacked/cef/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/lib/CEF/',
diff --git a/prebuilt/scripts/build-cef.bat b/prebuilt/scripts/build-cef.bat
@@ -9,11 +9,11 @@ REM #
 ECHO Build CEF-%CEF_VERSION%.%CEF_BUILDREVISION% for %BUILDTRIPLE%
 
 IF %ARCH%==x86_64 (
-	SET CEF_SRC_NAME=cef_binary_%CEF_VERSION%%2B%CEF_BUILDREVISION%%2Bchromium-%CEFChromium_VERSION%_windows64
-	SET CEF_DST_NAME=cef_binary_%CEF_VERSION%_%CEF_BUILDREVISION%_windows64
+	SET CEF_SRC_NAME=cef_binary_%CEF_VERSION%%%2B%CEF_BUILDREVISION%%%2Bchromium-%CEFChromium_VERSION%_windows64
+	SET CEF_DST_NAME=cef_binary_%CEF_VERSION%+%CEF_BUILDREVISION%+chromium-%CEFChromium_VERSION%_windows64
 ) ELSE (
-	SET CEF_SRC_NAME=cef_binary_%CEF_VERSION%%2B%CEF_BUILDREVISION%%2Bchromium-%CEFChromium_VERSION%_windows32
-	SET CEF_DST_NAME=cef_binary_%CEF_VERSION%_%CEF_BUILDREVISION%_windows32
+	SET CEF_SRC_NAME=cef_binary_%CEF_VERSION%%%2B%CEF_BUILDREVISION%%%2Bchromium-%CEFChromium_VERSION%_windows32
+	SET CEF_DST_NAME=cef_binary_%CEF_VERSION%+%CEF_BUILDREVISION%+chromium-%CEFChromium_VERSION%_windows32
 )
 
 SET CEF_TGZ=%_ROOT_DIR%\%CEF_DST_NAME%.tar.bz2
diff --git a/prebuilt/scripts/build-cef.sh b/prebuilt/scripts/build-cef.sh
@@ -6,10 +6,10 @@ source "${BASEDIR}/scripts/util.inc"
 
 # Grab the source for the library
 if [ "${ARCH}" == "x86" ] ; then
-   CEF_DST="cef_binary_${CEF_VERSION}_${CEF_BUILDREVISION}_${PLATFORM}32"
+   CEF_DST="cef_binary_${CEF_VERSION}+${CEF_BUILDREVISION}+chromium-${CEFChromium_VERSION}_${PLATFORM}32"
    CEF_SRC="cef_binary_${CEF_VERSION}%2B${CEF_BUILDREVISION}%2Bchromium-${CEFChromium_VERSION}_${PLATFORM}32.tar.bz2"
 elif [ "${ARCH}" == "x86_64" ] ; then
-   CEF_DST="cef_binary_${CEF_VERSION}_${CEF_BUILDREVISION}_${PLATFORM}64"
+   CEF_DST="cef_binary_${CEF_VERSION}+${CEF_BUILDREVISION}+chromium-${CEFChromium_VERSION}_${PLATFORM}64"
    CEF_SRC="cef_binary_${CEF_VERSION}%2B${CEF_BUILDREVISION}%2Bchromium-${CEFChromium_VERSION}_${PLATFORM}64.tar.bz2"
 else 
   echo "No binaries available for arch"
