Browse Source

Remove 32bit Linux JDK from the Build, as this isn't supported by OpenJDK anymore and Ubuntu also stopped shipping 32bit builds. Also drop Blender Linux 32bit Support

MeFisto94 5 years ago
parent
commit
7f748feca5

+ 1 - 1
build.xml

@@ -238,7 +238,7 @@
                 <if>
                     <equals arg1="${env.BUILD_X86}" arg2="true"/>
                     <then>
-                        <property name="temp.platform2" value="windows-x86 linux-x86 " />
+                        <property name="temp.platform2" value="windows-x86" />
                         <echo message="Building for the X86 architecture "/>
                     </then>
                     <else>

+ 0 - 10
nbi/stub/build.xml

@@ -23,8 +23,6 @@
         <delete dir="${nbi.ext.dir}/products/blender-win32/dist"/>
         <delete dir="${nbi.ext.dir}/products/blender-win64/build"/>
         <delete dir="${nbi.ext.dir}/products/blender-win64/dist"/>
-        <delete dir="${nbi.ext.dir}/products/blender-linux32/build"/>
-        <delete dir="${nbi.ext.dir}/products/blender-linux32/dist"/>
         <delete dir="${nbi.ext.dir}/products/blender-linux64/build"/>
         <delete dir="${nbi.ext.dir}/products/blender-linux64/dist"/>
         <delete dir="${nbi.ext.dir}/engine/build"/>
@@ -203,14 +201,6 @@ jarsigner.enabled=${jarsigner.enabled}
 
             <!--normen-->
             <!-- Linux installers -->
-            <if property="platform" value="linux-x86"> 
-                <create-bundle root="${output.dir}/registry-temp" platform="${platform}"
-                               target="${bundles.release.dir}/${bundle.files.prefix}-${platform}.${bundle.extention}">
-                    <component uid="${main.product.uid}" version="${main.product.version}"/>
-                    <component uid="blender" version="${main.product.version}"/>
-                    <property name="nbi.bundled.jvm.file" value="${basedir}/../../jdks/jdk-${platform}.bin"/>
-                </create-bundle>
-            </if>
             <if property="platform" value="linux-x64"> 
                 <create-bundle root="${output.dir}/registry-temp" platform="${platform}"
                                target="${bundles.release.dir}/${bundle.files.prefix}-${platform}.${bundle.extention}">

+ 0 - 161
nbi/stub/ext/infra/build/products/blender-linux-x86/build.properties

@@ -1,161 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
-# 
-
-# path to the directory where the base build scripts library and properties 
-# reside
-common.dir=../../../../../.common
-
-# path to the local working directory; this directory which will be the target 
-# for checking out the sources and will be used for the build process
-# * this path can be either absolute or relative in any unix environment, 
-#   however, only relative paths are supported on windows, as the cygwin scp 
-#   command does not properly handle colon in local paths
-work.dir=./build
-
-# path to the local distributive directory; this directory will contain the 
-# distributive file, when (if) the build script finishes successfully
-dist.dir=./dist
-
-# path to the products's sources within the cvs module; it should be a relative 
-# path from the module's root, e.g. for 'nbi/engine', where 'nbi is the module 
-# name, the path should be 'engine'
-cvs.path=components/products/blender
-
-# core product properties: 
-# * ${product.uid} - product "family" (e.g. nb-ide)
-# * ${product.version} - actual products' version; together with the uid it 
-#   forms the unique identifier for the product)
-# * ${product.platforms} - the list of platforms that are supported by this 
-#   product (note that this property is not related to native libraries)
-product.uid=blender
-#normen - do not change this to the actual app version, it has to be the jME SDK version
-product.version={product-version}
-product.platforms=linux-x86
-
-# miscellaneous product properties:
-# * ${product.status} - default status that the product will have in the 
-#   registry. it is meant to be always "not-installed", unless you want 
-#   something really exotic
-# * ${product.offset} - order of the product's node among its parent's 
-#   children, the bigger the offset value, the further the product's node will 
-#   be
-# * ${product.expand} - whether to automatically expand the product's node in 
-#   the components tree or not; 'true'/'false'
-# * ${product.visible} - whether the product's node is visible or not (note 
-#   that this value will be modified at nbi runtime, 'true' may become 'false' 
-#   if the product is filtered out); 'true'/'false'
-# * ${product.features} - list of features that this product belongs to; the 
-#   list should be space-separated
-product.status=not-installed
-product.offset=20000
-product.expand=false
-product.visible=true
-product.features=
-
-# list of configuration logic jar files; normally the first one would be the 
-# distributive file of the product's netbeans project
-# * ${product.logic.length} - total number of the files
-# * indices should start with 1
-product.logic.length=1
-product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name}
-
-# list of product installation data files
-# * ${product.data.length} - total number of the files
-# * ${product.data.N.uri} - uri at which the installation data file is located
-# * ${product.data.N.zip} - whether the data file is a zip archive which needs to 
-#   be extracted or it is a file that should be used directly; 'true'/'false'
-# * indices should start with 1
-product.data.length=1
-product.data.1.zip=false
-product.data.1.uri=http://download.blender.org/release/Blender2.79/blender-2.79-linux-glibc219-i686.tar.bz2
-product.data.tar=blender-2.79-linux-glibc219-i686.tar.bz2
-product.data.sub.dir=blender-2.79-linux-glibc219-i686
-
-# modificator for the required disk space parameter; the core value will be the
-# sum of unzipped unstallation data files
-# * the measurement unit is one byte
-product.disk.space.modificator=0
-
-# product's requirements (i.e. other products that should be installed
-# in order for this product to succesfully install and function)
-# * ${product.requirements.length} - total number of the requirements
-# * indices should start with 1
-product.requirements.length=0
-#product.requirements.1.uid=
-#product.requirements.1.version-lower=
-#product.requirements.1.version-upper=
-
-# product's conflicts (i.e. other products that prevent this product from 
-# functioning correctly, and thus cannot be installed together with it)
-# * ${product.conflicts.length} - total number of the conflicts
-# * indices should start with 1
-product.conflicts.length=0
-#product.conflicts.1.uid=
-#product.conflicts.1.version-lower=
-#product.conflicts.1.version-upper=
-
-# other products that should be installed prior to this product; these 
-# dependencies do not imply that the dependent product will be installed at 
-# all, but if both the current and the dependent product are selected for 
-# installation, the latter will be installed first
-# * ${product.install-afters.length} - total number of the install-afters
-# * indices should start with 1
-product.install-afters.length=0
-#product.install-afters.1.uid=
-
-# additional product's properties; these will appear in the product's 
-# descriptor and in the registry in the form of 
-# <property name="[name]">value</property> tags.
-# * ${product.properties.length} - total number of the properties
-# * indices should start with 1
-# * properties are not i18n compliant
-product.properties.length=3
-product.properties.1.name=installation.location
-product.properties.1.value=$N{install}/{product-install-directory-name}
-product.properties.2.name=installation.location.windows
-product.properties.2.value=$N{install}/{product-install-directory-name-windows}
-product.properties.3.name=installation.location.macosx
-product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.app
-
-# sources parameters; a search-and-replace will be run over the sources after 
-# check-out, replacing [token] => [value]; regular expressions are not allowed
-# * ${sources.params.length} - total number of the parameters
-# * indices should start with 1
-# * parameters are not i18n compliant
-sources.params.length=0

+ 0 - 101
nbi/stub/ext/infra/build/products/blender-linux-x86/build.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-  Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-  Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-  Other names may be trademarks of their respective owners.
-
-  The contents of this file are subject to the terms of either the GNU General Public
-  License Version 2 only ("GPL") or the Common Development and Distribution
-  License("CDDL") (collectively, the "License"). You may not use this file except in
-  compliance with the License. You can obtain a copy of the License at
-  http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-  License for the specific language governing permissions and limitations under the
-  License.  When distributing the software, include this License Header Notice in
-  each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-  designates this particular file as subject to the "Classpath" exception as provided
-  by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-  If applicable, add the following below the License Header, with the fields enclosed
-  by brackets [] replaced by your own identifying information:
-  "Portions Copyrighted [year] [name of copyright owner]"
-  
-  Contributor(s):
-  
-  The Original Software is NetBeans. The Initial Developer of the Original Software
-  is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-  Rights Reserved.
-  
-  If you wish your version of this file to be governed by only the CDDL or only the
-  GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-  this software in this distribution under the [CDDL or GPL Version 2] license." If
-  you do not indicate a single choice of license, a recipient has the option to
-  distribute your version of this file under either the CDDL, the GPL Version 2 or
-  to extend the choice of license to its licensees as provided above. However, if you
-  add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-  option applies only if the new code is made subject to such option by the copyright
-  holder.
--->
-
-<!--
-  This is the build script for the helloworld product package.
-    
-  It inherits most of the functionality from the base script for building nbi 
-  product packages, while providing this instance-specific values for several
-  core properties. For more details on the values of these properties see
-  the build.properties file.
--->
-<project name="helloworld-product" default="usage" basedir=".">
-    <!-- import the properties that are specific to this environment -->
-    <property file="${environment.properties}"/>
-
-    <!-- import the properties that are specific to this product package -->
-    <property file="build.properties"/>
-    
-    <!-- import the base script for building product packages -->
-    <import file="${common.dir}/product.xml" optional="false"/>
-    
-    <target name="-pre-package">
-        <untar src="${data.directory}/${product.data.tar}" dest="${data.directory}" compression="bzip2"/>
-        <delete file="${data.directory}/${product.data.tar}"/>
-
-        <mkdir dir="${data.directory}/__tmpdir__"/>
-
-        <move todir="${data.directory}/__tmpdir__">
-            <fileset dir="${data.directory}/${product.data.sub.dir}">
-                <include name="**"/>
-            </fileset>
-        </move>
-        
-        <delete dir="${data.directory}/${product.data.sub.dir}" includeemptydirs="true"/>
-
-        <move todir="${data.directory}">
-            <fileset dir="${data.directory}/__tmpdir__">
-                <include name="**"/>
-            </fileset>
-        </move>
-        <delete dir="${data.directory}/__tmpdir__" includeemptydirs="true"/>
-        <!--
-        <exec executable="sh" failonerror="false" dir="${data.directory}">
-            <arg value="-c"/>
-            <arg value="chmod a+x bin/*.sh"/>
-        </exec>
-        -->
-    </target>
-
-    <!--
-      The default target. 
-      
-      Does nothing except printing the usage information.
-    -->
-    <target name="usage">
-        <echo>
-            In order to 'clean', 'checkout' and 'build' the group use the 
-            'build-all' target. To 'clean', 'checkout', 'build' and 
-            'release' - use 'release-all'.
-            
-            For more details, please see the source of this build script.
-        </echo>
-    </target>
-</project>