JBR-2291 add vendor info into bundles

vprovodin · vprovodin · commit 088a6cb70be0 · 2020-05-12T07:27:33.000+07:00
diff --git a/jb/project/tools/common.sh b/jb/project/tools/common.sh
@@ -0,0 +1,3 @@
+VENDOR_NAME="JetBrains s.r.o."
+VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION_WITH_DOTS}.${JDK_BUILD_NUMBER}-${build_number}"
+[ -z ${bundle_type} ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
diff --git a/jb/project/tools/linux/scripts/mkimages.sh b/jb/project/tools/linux/scripts/mkimages.sh
@@ -21,6 +21,9 @@ JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
 
 function create_jbr {
 
@@ -79,6 +82,8 @@ esac
 sh configure \
   --disable-warnings-as-errors \
   --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
@@ -104,6 +109,9 @@ if [[ "$bundle_type" == *jcef* ]]; then
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...
+  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
+
   tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
     -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
   gzip $JBSDK.tar || exit $?
diff --git a/jb/project/tools/mac/scripts/mkimages.sh b/jb/project/tools/mac/scripts/mkimages.sh
@@ -21,6 +21,9 @@ JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
 
 function create_jbr {
 
@@ -88,6 +91,8 @@ esac
 sh configure \
   --disable-warnings-as-errors \
   --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
@@ -105,7 +110,6 @@ JBRSDK_BUNDLE=jbrsdk
 
 rm -rf $BASE_DIR
 mkdir $BASE_DIR || exit $?
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 if [[ "$bundle_type" == *jcef* ]]; then
@@ -114,6 +118,8 @@ if [[ "$bundle_type" == *jcef* ]]; then
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...
+  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
+  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
   COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
     --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
     --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
diff --git a/jb/project/tools/windows/scripts/mkimages.sh b/jb/project/tools/windows/scripts/mkimages.sh
@@ -21,6 +21,9 @@ JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
 
 function create_jbr {
 
@@ -68,6 +71,8 @@ PATH="/usr/local/bin:/usr/bin:${PATH}"
   --disable-warnings-as-errors \
   --disable-debug-symbols \
   --with-target-bits=64 \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
   --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
@@ -92,6 +97,8 @@ JBRSDK_BUNDLE=jbrsdk
 
 rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
 cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin
+sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
+mv release ${JBRSDK_BUNDLE}/release
 
 JBR_BUNDLE=jbr_${bundle_type}
 create_jbr ${bundle_type}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+VENDOR_NAME="JetBrains s.r.o."`
	`2`	`+VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION_WITH_DOTS}.${JDK_BUILD_NUMBER}-${build_number}"`
	`3`	`+[ -z ${bundle_type} ] \|\| VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"`