Skip to content

Commit 8258141

Browse files
vprovodinvprovodin
committed
JBR-7797 build fastdebug without jcef
1 parent fce5ed6 commit 8258141

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎jb/project/tools/linux/scripts/mkimages_aarch64.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ JBRSDK_BUNDLE=jbrsdk
140140
echo Fixing permissions
141141
chmod -R a+r $JSDK
142142

143-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
143+
if [ "$bundle_type" == "jcef" ]; then
144144
git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
145145
update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
146146
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -153,7 +153,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
153153

154154
# create sdk image bundle
155155
modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
156-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
156+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
157157
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
158158
fi
159159
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?

‎jb/project/tools/linux/scripts/mkimages_x64.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ JBRSDK_BUNDLE=jbrsdk
157157
echo Fixing permissions
158158
chmod -R a+r $JSDK
159159

160-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
160+
if [ "$bundle_type" == "jcef" ]; then
161161
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
162162
update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
163163
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -170,7 +170,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
170170

171171
# create sdk image bundle
172172
modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
173-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
173+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
174174
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
175175
fi
176176
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?

‎jb/project/tools/linux/scripts/mkimages_x86.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ JBRSDK_BUNDLE=jbrsdk
119119
echo Fixing permissions
120120
chmod -R a+r $JSDK
121121

122-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
122+
if [ "$bundle_type" == "jcef" ]; then
123123
jbr_name_postfix="_${bundle_type}"
124124
else
125125
jbr_name_postfix=""

‎jb/project/tools/mac/scripts/mkimages.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
153153

154154
# create sdk image bundle
155155
modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
156-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
156+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
157157
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
158158
fi
159159
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

‎jb/project/tools/windows/scripts/mkimages_aarch64.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ if [ $? -eq 0 ]; then
126126
JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
127127
fi
128128

129-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
129+
if [ "$bundle_type" == "jcef" ]; then
130130
git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
131131
update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
132132
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
@@ -144,7 +144,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
144144

145145
# create sdk image bundle
146146
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g) || do_exit $?
147-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
147+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
148148
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
149149
fi
150150
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

‎jb/project/tools/windows/scripts/mkimages_x64.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if [ $? -eq 0 ]; then
119119
JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
120120
fi
121121

122-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
122+
if [ "$bundle_type" == "jcef" ]; then
123123
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
124124
update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
125125
cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
@@ -137,7 +137,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
137137

138138
# create sdk image bundle
139139
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
140-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
140+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
141141
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
142142
fi
143143
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

‎jb/project/tools/windows/scripts/mkimages_x86.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ JSDK=$IMAGES_DIR/jdk
109109
JSDK_MODS_DIR=$IMAGES_DIR/jmods
110110
JBRSDK_BUNDLE=jbrsdk
111111

112-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
112+
if [ "$bundle_type" == "jcef" ]; then
113113
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
114114
update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
115115
cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
@@ -126,7 +126,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
126126

127127
# create sdk image bundle
128128
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
129-
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
129+
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
130130
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
131131
fi
132132
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

0 commit comments

Comments
 (0)