This is an automated email from the ASF dual-hosted git repository.
rtaneja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c2b8160 Parameterise NetBeans version number for installer builds
(#1294)
c2b8160 is described below
commit c2b81607f85f4d664440ed217cbf529d1811dd9a
Author: Reema Taneja <[email protected]>
AuthorDate: Sat Jun 15 00:36:37 2019 +0530
Parameterise NetBeans version number for installer builds (#1294)
* Parameterize nb version number
* Parameterize nb version number
display string changes
* Parameterise netbeans version number
* added build script in readme file
---
.../components/actions/netbeans/Bundle.properties | 2 +-
.../components/panels/netbeans/Bundle.properties | 10 +--
.../sequences/netbeans/Bundle.properties | 4 +-
nbbuild/installer/infra/build/build.xml | 7 +--
.../installer/infra/build/engine/build.properties | 2 +-
nbbuild/installer/infra/build/init.sh | 1 +
.../infra/build/products/nb-all/build.properties | 6 +-
nbbuild/installer/mac/newbuild/build.pro | 4 +-
nbbuild/installer/mac/newbuild/build.sh | 11 ++--
nbbuild/installer/readme.txt | 71 ++++++++++++++++++++++
nbbuild/newbuild/build-nbi.sh | 4 +-
nbbuild/newbuild/init.sh | 4 +-
12 files changed, 98 insertions(+), 28 deletions(-)
diff --git
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle.properties
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle.properties
index 684da4f..c88d7ec 100644
---
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle.properties
+++
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle.properties
@@ -19,7 +19,7 @@
###############################################################################
# NbInitializationAction.java
NIA.title=Configuring the Installer...
-NIA.description=Please wait while NetBeans IDE installer initializes
+NIA.description=Please wait while Apache NetBeans IDE installer initializes
NIA.progress.title=Configuring the Installer...
###############################################################################
diff --git
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties
index 48d9409..87c484b 100644
---
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties
+++
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle.properties
@@ -67,7 +67,7 @@ NPrISP.check.for.updates.checkbox=Check for &Updates
################################################################################
# NbPostInstallSummaryPanel.java
NPoISP.title=Setup Complete
-NPoISP.description=Click Finish to finish the NetBeans IDE setup.
+NPoISP.description=Click Finish to complete the Apache NetBeans IDE setup.
NPoISP.message.text.success=<html><b>Installation completed
successfully.</b></html>
#NOI18N
@@ -85,9 +85,9 @@ NPoISP.message.restart.text=<html><span color="red"><b>Please
restart your compu
#NOI18N
NPoISP.message.restart.content.type=text/html
-NPoISP.message.netbeans.text.windows=To launch the IDE, use either the Start
menu or the NetBeans desktop icon.\n\nTo change installed components and add
NetBeans plugins, use Plugin Manager that is an integral part of NetBeans IDE.
-NPoISP.message.netbeans.text.unix=To launch the IDE, use the NetBeans desktop
icon.\n\nTo change installed components and add NetBeans plugins, use Plugin
Manager that is an integral part of NetBeans IDE.
-NPoISP.message.netbeans.text.macosx=To launch the IDE, use the NetBeans dock
icon.\n\nTo change installed components and add NetBeans plugins, use Plugin
Manager that is an integral part of NetBeans IDE.
+NPoISP.message.netbeans.text.windows=To launch the IDE, use either the Start
menu or the Apache NetBeans desktop icon.\n\nTo change installed components and
add NetBeans plugins, use Plugin Manager that is an integral part of Apache
NetBeans IDE.
+NPoISP.message.netbeans.text.unix=To launch the IDE, use the Apache NetBeans
desktop icon.\n\nTo change installed components and add NetBeans plugins, use
Plugin Manager that is an integral part of Apache NetBeans IDE.
+NPoISP.message.netbeans.text.macosx=To launch the IDE, use the Apache NetBeans
dock icon.\n\nTo change installed components and add NetBeans plugins, use
Plugin Manager that is an integral part of Apache NetBeans IDE.
#NOI18N
NPoISP.message.netbeans.content.type=text/plain
@@ -113,7 +113,7 @@ NPoISP.message.registration.checkbox=&Register the {0}
after finishing the insta
#NOI18N
NPoISP.message.registration.content.type=text/html
-NPoISP.message.metrics.checkbox=&Contribute to the NetBeans project by
providing anonymous usage data
+NPoISP.message.metrics.checkbox=&Contribute to the Apache NetBeans project by
providing anonymous usage data
#NOI18N
NPoISP.message.metrics.list.content.type=text/html
NPoISP.message.metrics.list=<html>\
diff --git
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle.properties
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle.properties
index f55d864..3901af9 100644
---
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle.properties
+++
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle.properties
@@ -19,9 +19,9 @@
#####################################################################################
# MainSequence.java
NBMS.IA.title=Installation
-NBMS.IA.description=Please wait while the installer installs NetBeans IDE and
runtimes.
+NBMS.IA.description=Please wait while the installer installs Apache NetBeans
IDE and runtimes.
-NBMS.CACHE.title=Completing NetBeans IDE installation
+NBMS.CACHE.title=Completing Apache NetBeans IDE installation
NBMS.CACHE.generate=Validation
NBMS.CACHE.CheckForUpdate=Checking for Updates
NBMS.CACHE.InstallJUnit=Installing JUnit library
diff --git a/nbbuild/installer/infra/build/build.xml
b/nbbuild/installer/infra/build/build.xml
index 22fd897..484e709 100644
--- a/nbbuild/installer/infra/build/build.xml
+++ b/nbbuild/installer/infra/build/build.xml
@@ -237,10 +237,9 @@
<set property="nb.build.number"
value="${build.number}"/>
- <!--
- <set property="nb.build.number"
- value="0"/>
- -->
+
+ <set property="nb.version.number"
+ value="${nb.version}"/>
<set property="nb.full.version"
value="11.0.0.0.${nb.build.number}"/>
diff --git a/nbbuild/installer/infra/build/engine/build.properties
b/nbbuild/installer/infra/build/engine/build.properties
index fdcb621..f56d80f 100644
--- a/nbbuild/installer/infra/build/engine/build.properties
+++ b/nbbuild/installer/infra/build/engine/build.properties
@@ -55,6 +55,6 @@
nb.custom.parameter=-Dreference.NBI_Engine.jar=${core.engine.dist.file}
sources.params.length=2
sources.params.1.token={display-version}
-sources.params.1.value=11.0
+sources.params.1.value=${nb.version.number}
sources.params.2.token={jtb-display-version}
sources.params.2.value=0
diff --git a/nbbuild/installer/infra/build/init.sh
b/nbbuild/installer/infra/build/init.sh
index b97b016..a18b649 100644
--- a/nbbuild/installer/infra/build/init.sh
+++ b/nbbuild/installer/infra/build/init.sh
@@ -61,3 +61,4 @@ echo jarsigner.storepass="${JARSIGNER_STOREPASS}"
echo pack200.enabled="${USE_PACK200}"
echo nbi.cache.dir="${CACHE_DIR}"
echo nb.binary.name="${BINARY_NAME}"
+echo nb.version="${NB_VER_NUMBER}"
diff --git a/nbbuild/installer/infra/build/products/nb-all/build.properties
b/nbbuild/installer/infra/build/products/nb-all/build.properties
index 8eec55e..636f5d3 100644
--- a/nbbuild/installer/infra/build/products/nb-all/build.properties
+++ b/nbbuild/installer/infra/build/products/nb-all/build.properties
@@ -141,9 +141,9 @@ product.install-afters.2.uid=jre-nested
# * properties are not i18n compliant
product.properties.length=4
product.properties.1.name=installation.location
-product.properties.1.value=$N{install}/netbeans-11.0
+product.properties.1.value=$N{install}/netbeans-${nb.version.number}
product.properties.2.name=installation.location.windows
-product.properties.2.value=$N{install}/NetBeans-11.0
+product.properties.2.value=$N{install}/NetBeans-${nb.version.number}
product.properties.3.name=installation.location.macosx
product.properties.3.value=$N{install}/NetBeans/NetBeans 11.app
product.properties.4.name=minimum.jdk.version
@@ -156,7 +156,7 @@ product.properties.4.value=1.8.0
# * parameters are not i18n compliant
sources.params.length=4
sources.params.1.token={display-version}
-sources.params.1.value=11.0
+sources.params.1.value=${nb.version.number}
sources.params.2.token={platform-cluster}
sources.params.2.value=platform
sources.params.3.token={nb-cluster}
diff --git a/nbbuild/installer/mac/newbuild/build.pro
b/nbbuild/installer/mac/newbuild/build.pro
index bdde70c..bda4079 100644
--- a/nbbuild/installer/mac/newbuild/build.pro
+++ b/nbbuild/installer/mac/newbuild/build.pro
@@ -27,9 +27,9 @@
<property name="install.dir" value="/Applications/NetBeans"/>
<!-- Base IDE properties -->
- <property name="nbide.version" value="11.0"/>
+ <property name="nbide.version" value="${versionnumber}"/>
<property name="nbide.id" value="${nbide.version}"/>
- <property name="appname" value="Apache NetBeans 11.0"/>
+ <property name="appname" value="Apache NetBeans ${nbide.version}"/>
<property name="mpkg.name_nb" value="${appname}"/>
<property name="app.name" value="${install.dir}/${appname}.app"/>
<property name="nbClusterDir" value="nb"/>
diff --git a/nbbuild/installer/mac/newbuild/build.sh
b/nbbuild/installer/mac/newbuild/build.sh
index d3398c8..bb1aaf3 100755
--- a/nbbuild/installer/mac/newbuild/build.sh
+++ b/nbbuild/installer/mac/newbuild/build.sh
@@ -43,12 +43,9 @@ build_jdk8=$5
build_jdk11=$6
binaryname=$7
mac_sign_idname=$8
-#mac_sign_client=$7
-#mac_sign_user=$8
-#mac_sign_guid=$9
-#codesignbureau_credfile=${10}
-if [ -n "${9}" ] ; then
- nb_locales=",${9}"
+version_number=$9
+if [ -n "${10}" ] ; then
+ nb_locales=",${10}"
fi
basename=`dirname "$0"`
@@ -85,5 +82,5 @@ fi
rm -rf "$basename"/dist_en
-ant -f $basename/build.xml $target -Dlocales=$nb_locales
-Dcommon.name=$commonname -Dnb.binary.name=$binaryname
-Dmac.sign.idname="$mac_sign_idname" -Dprefix=$prefix
-Dbuildnumber=$buildnumber -Dmac.sign.client=$mac_sign_client
-Dmac.sign.user=$mac_sign_user -Dmac.sign.guid=$mac_sign_guid
-Dbuild.jdk7=$build_jdk7 -Dbuild.jdk8=$build_jdk8 -Dbuild.jdk11=$build_jdk11
-Dgf_builds_host=$GLASSFISH_BUILDS_HOST -Djre_builds_host=$JRE_BUILDS_HOST
-Djdk_builds_host=$JDK_BUILDS_HOST -Djre_builds_pa [...]
+ant -f $basename/build.xml $target -Dlocales=$nb_locales
-Dcommon.name=$commonname -Dnb.binary.name=$binaryname
-Dmac.sign.idname="$mac_sign_idname" -Dprefix=$prefix
-Dbuildnumber=$buildnumber -Dversionnumber=$version_number
-Dmac.sign.client=$mac_sign_client -Dmac.sign.user=$mac_sign_user
-Dmac.sign.guid=$mac_sign_guid -Dbuild.jdk7=$build_jdk7
-Dbuild.jdk8=$build_jdk8 -Dbuild.jdk11=$build_jdk11
-Dgf_builds_host=$GLASSFISH_BUILDS_HOST -Djre_builds_host=$JRE_BUILDS_HOST
-Djdk_builds_host= [...]
mv -f "$basename"/dist "$basename"/dist_en
diff --git a/nbbuild/installer/readme.txt b/nbbuild/installer/readme.txt
new file mode 100755
index 0000000..48d9c91
--- /dev/null
+++ b/nbbuild/installer/readme.txt
@@ -0,0 +1,71 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#Build script for generating Apache NetBeans IDE installers
+BASE_DIR=`pwd`
+NB_ALL=$BASE_DIR
+export BASE_DIR NB_ALL
+
+DIST=$BASE_DIR/dist
+export DIST
+
+if [ -d $DIST ] ; then
+rm -rf $DIST
+fi
+
+mkdir -p $DIST/zip/moduleclusters
+mkdir -p $DIST/logs
+
+BINARY_NAME=incubating-netbeans-11.0-vc4-bin.zip
+export BINARY_NAME
+cp $BINARY_NAME $DIST/zip/moduleclusters
+cd $BASE_DIR
+NB_BUILD_NUMBER=1
+BUILDNUMBER=$NB_BUILD_NUMBER
+DATESTAMP=$BUILDNUMBER
+NB_VER_NUMBER=11.1
+BASENAME_PREFIX=Apache-NetBeans-$NB_VER_NUMBER-bin
+BUILD_DESC=$BASENAME_PREFIX
+#export NB_VER_NUMBER BUILDNUMBER BASENAME_PREFIX NB_BUILD_NUMBER DATESTAMP
BUILD_DESC
+export BUILDNUMBER BASENAME_PREFIX NB_BUILD_NUMBER DATESTAMP BUILD_DESC
+
+#To build MAC installer on mac host set BUILD_MAC to 1
+BUILD_MAC=0
+export BUILD_MAC
+MAC_SIGN_IDENTITY_NAME=/Users/reemataneja/sign.txt
+export MAC_SIGN_IDENTITY_NAME
+
+#To build linux and windows installers set BUILD_NB=1
+BUILD_NB=1
+BUILD_NETBEANS=0
+BUILD_NBJDK6=0
+BUILD_NBJDK7=0
+BUILD_NBJDK8=0
+BUILD_NBJDK11=0
+
+export BUILD_NETBEANS BUILD_NB
+export BUILD_NBJDK6 BUILD_NBJDK7 BUILD_NBJDK8 BUILD_NBJDK11
+
+OUTPUT_DIR=${NB_ALL}/dist/installers
+export OUTPUT_DIR
+
+DONT_SIGN_INSTALLER=y
+export DONT_SIGN_INSTALLER
+
+bash -x $NB_ALL/nbbuild/newbuild/build-nbi.sh
diff --git a/nbbuild/newbuild/build-nbi.sh b/nbbuild/newbuild/build-nbi.sh
index 6426d8a..e126168 100644
--- a/nbbuild/newbuild/build-nbi.sh
+++ b/nbbuild/newbuild/build-nbi.sh
@@ -73,7 +73,7 @@ if [ ! -z $NATIVE_MAC_MACHINE ] && [ ! -z $MAC_PATH ]; then
sh $NB_ALL/nbbuild/installer/mac/newbuild/init.sh | ssh $NATIVE_MAC_MACHINE
"cat > $MAC_PATH/nbbuild/installer/mac/newbuild/build-private.sh"
ssh $NATIVE_MAC_MACHINE chmod a+x
$MAC_PATH/nbbuild/installer/mac/newbuild/build.sh
- BASE_COMMAND="$MAC_PATH/nbbuild/installer/mac/newbuild/build.sh $MAC_PATH
$BASENAME_PREFIX $BUILDNUMBER $BUILD_NBJDK7 $BUILD_NBJDK8 $BUILD_NBJDK11
$MAC_SIGN_CLIENT $MAC_SIGN_USER $MAC_SIGN_GUID $CODESIGNBUREAU_CREDFILE
$LOCALES $BINARY_NAME"
+ BASE_COMMAND="$MAC_PATH/nbbuild/installer/mac/newbuild/build.sh $MAC_PATH
$BASENAME_PREFIX $BUILDNUMBER $BUILD_NBJDK7 $BUILD_NBJDK8 $BUILD_NBJDK11
$MAC_SIGN_CLIENT $MAC_SIGN_USER $MAC_SIGN_GUID $CODESIGNBUREAU_CREDFILE
$LOCALES $BINARY_NAME $NB_VER_NUMBER"
ssh $NATIVE_MAC_MACHINE "$UNLOCK_COMMAND $BASE_COMMAND" > $MAC_LOG_NEW 2>&1
&
REMOTE_MAC_PID=$!
@@ -84,7 +84,7 @@ if [ ! -z $BUILD_MAC ]; then
sh $NB_ALL/nbbuild/installer/mac/newbuild/init.sh | cat >
$NB_ALL/nbbuild/installer/mac/newbuild/build-private.sh
chmod a+x $NB_ALL/nbbuild/installer/mac/newbuild/build.sh
- BASE_COMMAND="$NB_ALL/nbbuild/installer/mac/newbuild/build.sh $DIST
$BASENAME_PREFIX $BUILDNUMBER $BUILD_NBJDK7 $BUILD_NBJDK8 $BUILD_NBJDK11
$BINARY_NAME $MAC_SIGN_IDENTITY_NAME $LOCALES"
+ BASE_COMMAND="$NB_ALL/nbbuild/installer/mac/newbuild/build.sh $DIST
$BASENAME_PREFIX $BUILDNUMBER $BUILD_NBJDK7 $BUILD_NBJDK8 $BUILD_NBJDK11
$BINARY_NAME $MAC_SIGN_IDENTITY_NAME $NB_VER_NUMBER $LOCALES"
$BASE_COMMAND
fi
diff --git a/nbbuild/newbuild/init.sh b/nbbuild/newbuild/init.sh
index 819e5a8..adf6e4f 100644
--- a/nbbuild/newbuild/init.sh
+++ b/nbbuild/newbuild/init.sh
@@ -80,7 +80,9 @@ fi
if [ -z ${LOCALES} ]; then
export LOCALES=ja,zh_CN,pt_BR,ru
fi
-
+if [ -z ${NB_VER_NUMBER} ]; then
+ export NB_VER_NUMBER=11
+fi
if [ -z ${UPLOAD_ML} ]; then
export UPLOAD_ML=0
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
