mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2473 modify building scripts to add dcevm clauses, add git config to docker image

Browse Source 
(cherry picked from commit 2620c62848)
This commit is contained in:
Vitaly Provodin
2020-06-10 10:07:07 +07:00
committed by alexey.ushakov@jetbrains.com
parent 4f7884eeda
commit b30cbd3a8a
10 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jb/project/tools/linux/scripts/mkimages_aarch64.sh
View File

@@ -24,7 +24,7 @@ source jb/project/tools/common.sh
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
sh configure \
--disable-warnings-as-errors \

34
jb/project/tools/linux/scripts/mkimages_x64.sh
View File

@@ -58,9 +58,9 @@ function create_jbr {
JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
git checkout -- modules.list
git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
#git checkout -- modules.list
#git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
sh configure \
--disable-warnings-as-errors \
@@ -88,23 +88,27 @@ JBRSDK_BUNDLE=jbrsdk
rm -rf $BASE_DIR/$JBRSDK_BUNDLE
cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
if [[ "$bundle_type" == *jcef* ]]; then
if [ ! -z "$bundle_type" ]; then
cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
fi
echo Creating $JBSDK.tar.gz ...
sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
if [ "$bundle_type" == "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 $?
tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-C $BASE_DIR $JBRSDK_BUNDLE || exit $?
gzip $JBSDK.tar || exit $?
fi
create_jbr || exit $?
make test-image || exit $?
if [ "$bundle_type" == "jcef" ]; then
make test-image || exit $?
JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
echo Creating $JBSDK_TEST.tar.gz ...
tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
gzip $JBRSDK_TEST.tar || exit $?
echo Creating $JBSDK_TEST.tar.gz ...
tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
gzip $JBRSDK_TEST.tar || exit $?
fi

2
jb/project/tools/linux/scripts/mkimages_x64_fd.sh
View File

@@ -25,7 +25,7 @@ source jb/project/tools/common.sh
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
sh configure \
--disable-warnings-as-errors \

2
jb/project/tools/linux/scripts/mkimages_x86.sh
View File

@@ -24,7 +24,7 @@ source jb/project/tools/common.sh
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
linux32 bash configure \
--disable-warnings-as-errors \

36
jb/project/tools/mac/scripts/mkimages.sh
View File

@@ -66,9 +66,9 @@ function create_jbr {
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
git checkout -- modules.list
git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
#git checkout -- modules.list
#git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
sh configure \
--disable-warnings-as-errors \
@@ -94,23 +94,27 @@ rm -rf $BASE_DIR
mkdir $BASE_DIR || exit $?
cp -a $JSDK/jdk-$MAJOR_JBSDK_VERSION.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
if [[ "$bundle_type" == *jcef* ]]; then
if [[ ! -z "$bundle_type" ]]; then
cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
fi
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' \
$JBRSDK_BUNDLE || exit $?
if [ "$bundle_type" == "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' \
$JBRSDK_BUNDLE || exit $?
fi
create_jbr || exit $?
make test-image || exit $?
if [ "$bundle_type" == "jcef" ]; then
make test-image || exit $?
JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-server-release/images \
--exclude='test/jdk/demos' test || exit $?
echo Creating $JBRSDK_TEST.tar.gz ...
COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-server-release/images \
--exclude='test/jdk/demos' test || exit $?
fi

2
jb/project/tools/mac/scripts/mkimages_fd.sh
View File

@@ -25,7 +25,7 @@ source jb/project/tools/common.sh
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
sh configure \
--disable-warnings-as-errors \

15
jb/project/tools/exclude_jcef_module.patch → jb/project/tools/patches/exclude_jcef_module.patch
View File

@@ -3,9 +3,9 @@ IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules.list (revision a73d4ecbefe65fd6d79b78663d916ff71b5346f7)
+++ modules.list (date 1589581743550)
@@ -54,5 +54,4 @@
--- modules.list (revision 834c441b0f9d1a705a77f67768fa5e0411067b12)
+++ modules.list (date 1596011136827)
@@ -53,5 +53,4 @@
jdk.unsupported,
jdk.xml.dom,
jdk.zipfs,
@@ -17,17 +17,16 @@ IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/java.desktop/share/classes/module-info.java (revision a73d4ecbefe65fd6d79b78663d916ff71b5346f7)
+++ src/java.desktop/share/classes/module-info.java (date 1589581743547)
@@ -109,11 +109,7 @@
--- src/java.desktop/share/classes/module-info.java (revision 834c441b0f9d1a705a77f67768fa5e0411067b12)
+++ src/java.desktop/share/classes/module-info.java (date 1596011136835)
@@ -109,10 +109,7 @@
// see make/GensrcModuleInfo.gmk
exports sun.awt to
jdk.accessibility,
- jdk.unsupported.desktop,
- jcef;
-
- exports sun.lwawt.macosx to jcef;
- exports sun.lwawt to jcef;
- exports java.awt.peer to jcef;
+ jdk.unsupported.desktop;
exports java.awt.dnd.peer to jdk.unsupported.desktop;

16
jb/project/tools/windows/scripts/mkimages_x64.sh
View File

@@ -48,9 +48,9 @@ function create_jbr {
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
WORK_DIR=$(pwd)
git checkout -- modules.list
git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
#git checkout -- modules.list
#git checkout -- src/java.desktop/share/classes/module-info.java
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
PATH="/usr/local/bin:/usr/bin:${PATH}"
sh ./configure \
@@ -67,10 +67,16 @@ sh ./configure \
--disable-ccache \
--enable-cds=yes || exit 1
make LOG=info images CONF=windows-x86_64-server-release test-image || exit 1
if [ "$bundle_type" == "jcef" ]; then
make LOG=info images CONF=windows-x86_64-server-release test-image || exit 1else
fi
JSDK=build/windows-x86_64-server-release/images/jdk
JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
if [[ "$bundle_type" == "jcef" ]]; then
JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
fi
BASE_DIR=build/windows-x86_64-server-release/images
JBRSDK_BUNDLE=jbrsdk

2
jb/project/tools/windows/scripts/mkimages_x86.sh
View File

@@ -28,7 +28,7 @@ source jb/project/tools/common.sh
JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
WORK_DIR=$(pwd)
[ -z "$bundle_type" ] && git apply -p0 < jb/project/tools/exclude_jcef_module.patch
[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
PATH="/usr/local/bin:/usr/bin:${PATH}"
./configure \

16
jb/project/tools/windows/scripts/pack_x64.sh
View File

@@ -46,12 +46,16 @@ JSDK=$IMAGES_DIR/jdk
JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
BASE_DIR=.
JBRSDK_BUNDLE=jbrsdk
echo Creating $JBSDK.tar.gz ...
/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
if [ "$bundle_type" == "jcef" ]; then
JBRSDK_BUNDLE=jbrsdk
echo Creating $JBSDK.tar.gz ...
/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
fi
pack_jbr $bundle_type
JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1
if [ "$bundle_type" == "jcef" ]; then
JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1
fi