From 7ede220d8813a338e9150894fbb1e012dfbca330 Mon Sep 17 00:00:00 2001 From: Eric Barboni Date: Thu, 27 Feb 2025 14:08:05 +0100 Subject: [PATCH] Windows NBI removal --- resources/org/apache/netbeans/installer.sh | 160 ----------------- resources/org/apache/netbeans/installermac.sh | 162 ------------------ vars/asfMainNetBeansBuild.groovy | 26 +-- 3 files changed, 1 insertion(+), 347 deletions(-) delete mode 100644 resources/org/apache/netbeans/installer.sh delete mode 100644 resources/org/apache/netbeans/installermac.sh diff --git a/resources/org/apache/netbeans/installer.sh b/resources/org/apache/netbeans/installer.sh deleted file mode 100644 index 92a02d4..0000000 --- a/resources/org/apache/netbeans/installer.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/bash -# -# 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. -# -## param 1 workspace filename for binaries-zip -## param 2 version number xx.y (mandatory) -## param 3 timestamp YYMMDD - -BASE_DIR=`pwd` -NB_ALL=$BASE_DIR -export BASE_DIR NB_ALL - -`echo "$1 $2 $3" > parameters.info` - -if [[ "$3" ]]; then - echo 'I need 3 arguments:' - echo 'usage: installer usage [file path to Apache NetBeans binaries-zip] [versionumber formated xx.y] [timestamp YYMMDD]' -fi - -DIST=$BASE_DIR/dist -export DIST - -if [ -d $DIST ] ; then -rm -rf $DIST -fi - -rm -rf NBI-cache - -mkdir -p $DIST/zip/moduleclusters -mkdir -p $DIST/logs - -BIN_NAME=`basename $1` -BINARY_NAME=`echo "${BIN_NAME%%.zip*}"` - - -#create cluster zip files -rm -rf temp -unzip -q $1 -d temp -cd temp -mkdir javase -mkdir javase/netbeans -mkdir javaee -mkdir javaee/netbeans -mkdir webcommon -mkdir webcommon/netbeans -mkdir php -mkdir php/netbeans -mkdir extide -mkdir extide/netbeans - -cd netbeans -#java -mv apisupport ../javase/netbeans -mv ergonomics ../javase/netbeans -mv java ../javase/netbeans -mv javafx ../javase/netbeans -mv profiler ../javase/netbeans - -#javaee -mv enterprise ../javaee/netbeans -mv groovy ../javaee/netbeans - -#webcommon -mv webcommon ../webcommon/netbeans - -#php -mv php ../php/netbeans - -#websvccommon -mv websvccommon ../extide/netbeans - -#create cluster zip files -cd .. -echo `pwd` -echo $BINARY_NAME -zip -q -r $BINARY_NAME-base.zip netbeans -mv $BINARY_NAME-base.zip .. - -echo `pwd` - -cd javase -zip -q -r $BINARY_NAME-java.zip netbeans -mv $BINARY_NAME-java.zip ../.. -cd .. - -cd javaee -zip -q -r $BINARY_NAME-enterprise.zip netbeans -mv $BINARY_NAME-enterprise.zip ../.. -cd .. - -cd php -zip -q -r $BINARY_NAME-php.zip netbeans -mv $BINARY_NAME-php.zip ../.. -cd .. - -cd webcommon -zip -q -r $BINARY_NAME-webcommon.zip netbeans -mv $BINARY_NAME-webcommon.zip ../.. -cd .. - -cd extide -zip -q -r $BINARY_NAME-websvccommon.zip netbeans -mv $BINARY_NAME-websvccommon.zip ../.. -cd ../.. - -rm -rf temp - -mv $BINARY_NAME-*.zip $DIST/zip/moduleclusters - -export BINARY_NAME - -cd $BASE_DIR -NB_BUILD_NUMBER=$3 -BUILDNUMBER=$NB_BUILD_NUMBER -DATESTAMP=$BUILDNUMBER -NB_VER_NUMBER=$2 -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 - -MAC_PATH=$DIST -#export MAC_PATH - -MAC_LOG_NEW=$DIST/logs/native_mac-$BUILDNUMBER.log -export MAC_LOG_NEW -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 -BUNDLE_JDK_PLATFORM= -export BUNDLE_JDK_PLATFORM - - -DONT_SIGN_INSTALLER=y -export DONT_SIGN_INSTALLER - -bash -x $NB_ALL/nbbuild/newbuild/build-nbi.sh - -## cleanup cache -rm -rf NBI-cache diff --git a/resources/org/apache/netbeans/installermac.sh b/resources/org/apache/netbeans/installermac.sh deleted file mode 100644 index bf350f0..0000000 --- a/resources/org/apache/netbeans/installermac.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/bash -# -# 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. -# -## param 1 workspace filename for binaries-zip -## param 2 version number xx.y (mandatory) -## param 3 timestamp YYMMDD -## param 4 absolute file path to Apple Developer ID Installer Certificate text file -## param 5 absolute file path to Apple Developer ID Application Certificate text file - -BASE_DIR=`pwd` -NB_ALL=$BASE_DIR -export BASE_DIR NB_ALL - -if [[ "$5" ]]; then - echo 'I need 5 arguments:' - echo 'usage: installer usage [file path to Apache NetBeans binaries-zip] [versionumber formated xx.y] [timestamp YYMMDD] [path to installer certificate] [path to application certificate]' -fi - -DIST=$BASE_DIR/dist -export DIST - -if [ -d $DIST ] ; then -rm -rf $DIST -fi - -rm -rf NBI-cache - -mkdir -p $DIST/zip/moduleclusters -mkdir -p $DIST/logs - -BIN_NAME=`basename $1` -BINARY_NAME=`echo "${BIN_NAME%%.zip*}"` - -#create cluster zip files -rm -rf temp -unzip -q $1 -d temp -cd temp -mkdir javase -mkdir javase/netbeans -mkdir javaee -mkdir javaee/netbeans -mkdir webcommon -mkdir webcommon/netbeans -mkdir php -mkdir php/netbeans -mkdir extide -mkdir extide/netbeans - -cd netbeans -#java -mv apisupport ../javase/netbeans -mv ergonomics ../javase/netbeans -mv java ../javase/netbeans -mv javafx ../javase/netbeans -mv profiler ../javase/netbeans - -#javaee -mv enterprise ../javaee/netbeans -mv groovy ../javaee/netbeans - -#webcommon -mv webcommon ../webcommon/netbeans - -#php -mv php ../php/netbeans - -#websvccommon -mv websvccommon ../extide/netbeans - -#create cluster zip files -cd .. -echo `pwd` -echo $BINARY_NAME -zip -q -r $BINARY_NAME-base.zip netbeans -mv $BINARY_NAME-base.zip .. - -echo `pwd` - -cd javase -zip -q -r $BINARY_NAME-java.zip netbeans -mv $BINARY_NAME-java.zip ../.. -cd .. - -cd javaee -zip -q -r $BINARY_NAME-enterprise.zip netbeans -mv $BINARY_NAME-enterprise.zip ../.. -cd .. - -cd php -zip -q -r $BINARY_NAME-php.zip netbeans -mv $BINARY_NAME-php.zip ../.. -cd .. - -cd webcommon -zip -q -r $BINARY_NAME-webcommon.zip netbeans -mv $BINARY_NAME-webcommon.zip ../.. -cd .. - -cd extide -zip -q -r $BINARY_NAME-websvccommon.zip netbeans -mv $BINARY_NAME-websvccommon.zip ../.. -cd ../.. - -rm -rf temp - -mv $BINARY_NAME-*.zip $DIST/zip/moduleclusters - -export BINARY_NAME - -cd $BASE_DIR -NB_BUILD_NUMBER=$3 -BUILDNUMBER=$NB_BUILD_NUMBER -DATESTAMP=$BUILDNUMBER -NB_VER_NUMBER=$2 -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 - -#To build MAC installer on mac host set BUILD_MAC to 1 -BUILD_MAC=1 -export BUILD_MAC -INSTALLER_SIGN_IDENTITY_NAME=$4 -export INSTALLER_SIGN_IDENTITY_NAME -APPLICATION_SIGN_IDENTITY_NAME=$5 -export APPLICATION_SIGN_IDENTITY_NAME - -BUILD_NB=0 -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 -BUNDLE_JDK_PLATFORM= -export BUNDLE_JDK_PLATFORM - - -DONT_SIGN_INSTALLER=y -export DONT_SIGN_INSTALLER - -bash -x $NB_ALL/nbbuild/newbuild/build-nbi.sh - -## cleanup cache -rm -rf NBI-cache diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy index 32ec3c5..94fe685 100644 --- a/vars/asfMainNetBeansBuild.groovy +++ b/vars/asfMainNetBeansBuild.groovy @@ -358,40 +358,16 @@ def doParallelClusters(cconfigs) { // installer we prepare a folder so that release manager can build mac os on his own sh "mkdir -p dist${versionnedpath}nbms" sh "mkdir -p dist/installers" - sh "mkdir -p distpreparation${versionnedpath}installer" sh "mkdir -p dist/vsix" if (params.INSTALLERS) { // skip installers unless requested println "BUILDING INSTALLERS" - def installer = libraryResource 'org/apache/netbeans/installer.sh' - writeFile file: "distpreparation${versionnedpath}installer/installer.sh", text: installer - - def installermac = libraryResource 'org/apache/netbeans/installermac.sh' - writeFile file: "distpreparation${versionnedpath}installer/installermac.sh", text: installermac - - sh "chmod +x distpreparation${versionnedpath}installer/installer.sh" - - sh "mkdir -p distpreparation${versionnedpath}installer/nbbuild/newbuild && cp build-${clustername}-temp/nbbuild/newbuild/* distpreparation${versionnedpath}installer/nbbuild/newbuild " - sh "mkdir -p distpreparation${versionnedpath}installer/nbbuild/installer && cp -r build-${clustername}-temp/nbbuild/installer distpreparation${versionnedpath}installer/nbbuild " - sh "mkdir -p distpreparation${versionnedpath}installer/nbi && cp -r build-${clustername}-temp/nbi distpreparation${versionnedpath}installer " - sh "cp build-${clustername}-temp/nbbuild/binaries-default-properties.xml distpreparation${versionnedpath}installer/nbbuild/binaries-default-properties.xml " - sh "mkdir -p distpreparation${versionnedpath}installer/nbbuild/build/ && cp -r build-${clustername}-temp/nbbuild/build/antclasses distpreparation${versionnedpath}installer/nbbuild/build/antclasses " - - sh "mkdir -p distpreparation${versionnedpath}installer/nb/ide.launcher && cp -r build-${clustername}-temp/nb/ide.launcher/macosx distpreparation${versionnedpath}installer/nb/ide.launcher " - - - sh "cp build-${clustername}-temp/nbbuild/*${clustername}*.zip dist${versionnedpath}${path}-${rmversion}-bin.zip" def binaryfile = "../../../dist${versionnedpath}${path}-${rmversion}-bin.zip" def timestamp = sh(returnStdout: true, script: 'date +%y%m%d').trim() - sh "cd distpreparation${versionnedpath}installer && ./installer.sh ${binaryfile} ${version} ${timestamp}" // we archive put to nightlies only exe for window, nbpackage is intended to do the installler - sh "cp distpreparation${versionnedpath}installer/dist/bundles/*.exe dist/installers/ " - - sh "rm -rf distpreparation${versionnedpath}installer/dist" // XXX take too long 18012023 publishToNightlies("/netbeans/candidate/installerspreparation","distpreparation/**/**","distpreparation") - archiveArtifacts 'distpreparation/**' - + sh "mkdir -p nbpackage${versionnedpath}installer" withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy: 'EXPLICIT',mavenLocalRepo: localRepo,options:[artifactsPublisher(disabled: true)]) {