Merge branch 'main' into release/materials_featurette
Brad Linden
commit
23d7622d82
|
|
@ -13,7 +13,6 @@ jobs:
|
|||
matrix:
|
||||
runner: [windows-large, macos-12-xl]
|
||||
configuration: [Release, ReleaseOS]
|
||||
python-version: ["3.11"]
|
||||
include:
|
||||
- runner: macos-12-xl
|
||||
developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
|
||||
|
|
@ -67,7 +66,7 @@ jobs:
|
|||
- name: Setup python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Checkout build variables
|
||||
uses: actions/checkout@v4
|
||||
|
|
|
|||
73
BuildParams
73
BuildParams
|
|
@ -1,73 +0,0 @@
|
|||
# BuildParams
|
||||
#
|
||||
# Please refer to:
|
||||
# https://wiki.secondlife.com/wiki/Automated_Build_System
|
||||
|
||||
# Variants (NOTE: 'Release' must be last for uploads to work correctly)
|
||||
variants = "RelWithDebInfo Release"
|
||||
|
||||
# Use Public Upload Locations
|
||||
public_build = true
|
||||
build_docs = true
|
||||
|
||||
# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
|
||||
build_Linux_Doxygen = true
|
||||
|
||||
# Need viewer-build-variables as well as other shared repositories
|
||||
buildscripts_shared_more_NAMEs="build_secrets build_variables git_hooks"
|
||||
|
||||
# Python 3 / SL-15742
|
||||
BUILDSCRIPTS_PY3 = "true"
|
||||
|
||||
################################################################
|
||||
#### Examples of how to set the viewer_channel ####
|
||||
#
|
||||
# To build a Release or Release candidate in build bingo:
|
||||
# bingo.viewer_channel = "Second Life Release"
|
||||
#
|
||||
# To build a Beta for the 'Bingo' project in build bingo:
|
||||
# bingo.viewer_channel = "Second Life Beta Bingo"
|
||||
#
|
||||
# To build a Project viewer for the 'Bingo' project in build bingo:
|
||||
# bingo.viewer_channel = "Second Life Project Bingo"
|
||||
#
|
||||
# If left unset, viewer_channel defaults to 'Second Life Test',
|
||||
# which is appropriate for individual developer builds.
|
||||
#
|
||||
# All Linden Lab builds (and only Linden Lab builds)
|
||||
# should use a viewer_channel that begins with "Second Life"
|
||||
################################################################
|
||||
viewer_channel = "Second Life Test"
|
||||
|
||||
|
||||
################################################################
|
||||
# Special packaging parameters.
|
||||
# These parameters can be used to create additional packages
|
||||
# which identify themselves in a distinct way with either
|
||||
# a sourceid (sent to web services) or a channel name (sent to login)
|
||||
# the default sourceid should always be a null string:
|
||||
sourceid = ""
|
||||
# the additional_packages variable is a blank separated list of package prefixes:
|
||||
# additional_packages = ""
|
||||
# to set the special values for a package, create variables using each prefix:
|
||||
# additional_packages = "Foo Bar"
|
||||
# Foo_sourceid = "bingo"
|
||||
# Foo_viewer_channel_suffix = "Foo"
|
||||
# Bar_sourceid = "bongo"
|
||||
# Bar_viewer_channel_suffix = "Bar"
|
||||
# the viewer_channel_suffix is prefixed by a blank and then appended to the viewer_channel
|
||||
# for the package in a setting that overrides the compiled-in value
|
||||
################################################################
|
||||
additional_packages = "EDU"
|
||||
Linux.additional_packages = ""
|
||||
|
||||
# The EDU package allows us to create a separate release channel whose expirations
|
||||
# are synchronized as much as possible with the academic year
|
||||
EDU_sourceid = ""
|
||||
EDU_viewer_channel_suffix = "edu"
|
||||
|
||||
# Notifications - to configure email notices use the TeamCity parameter
|
||||
# setting screen for your project or build configuration to set the
|
||||
# environment variable 'email' to a space-separated list of email addresses
|
||||
email=""
|
||||
|
||||
3
build.sh
3
build.sh
|
|
@ -6,9 +6,6 @@
|
|||
# it relies on the environment that sets up, functions it provides, and
|
||||
# the build result post-processing it does.
|
||||
#
|
||||
# The shared buildscript build.sh invokes this because it is named 'build.sh',
|
||||
# which is the default custom build script name in buildscripts/hg/BuildParams
|
||||
#
|
||||
# PLEASE NOTE:
|
||||
#
|
||||
# * This script is interpreted on three platforms, including windows and cygwin
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
##
|
||||
## $LicenseInfo:firstyear=2011&license=viewerlgpl$
|
||||
## Second Life Viewer Source Code
|
||||
## Copyright (C) 2011, Linden Research, Inc.
|
||||
##
|
||||
## This library is free software; you can redistribute it and/or
|
||||
## modify it under the terms of the GNU Lesser General Public
|
||||
## License as published by the Free Software Foundation;
|
||||
## version 2.1 of the License only.
|
||||
##
|
||||
## This library is distributed in the hope that it will be useful,
|
||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
## Lesser General Public License for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU Lesser General Public
|
||||
## License along with this library; if not, write to the Free Software
|
||||
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
##
|
||||
## Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
## $/LicenseInfo$
|
||||
|
||||
import sys
|
||||
import os
|
||||
import glob
|
||||
|
||||
def delete_file_types(path, filetypes):
|
||||
if os.path.exists(path):
|
||||
print('Cleaning: ' + path)
|
||||
orig_dir = os.getcwd();
|
||||
os.chdir(path)
|
||||
filelist = []
|
||||
for type in filetypes:
|
||||
filelist.extend(glob.glob(type))
|
||||
for file in filelist:
|
||||
os.remove(file)
|
||||
os.chdir(orig_dir)
|
||||
|
||||
def main():
|
||||
build_types = ['*.exp','*.exe','*.pdb','*.idb',
|
||||
'*.ilk','*.lib','*.obj','*.ib_pdb_index']
|
||||
pch_types = ['*.pch']
|
||||
delete_file_types("build-vc80/newview/Release", build_types)
|
||||
delete_file_types("build-vc80/newview/secondlife-bin.dir/Release/",
|
||||
pch_types)
|
||||
delete_file_types("build-vc80/newview/RelWithDebInfo", build_types)
|
||||
delete_file_types("build-vc80/newview/secondlife-bin.dir/RelWithDebInfo/",
|
||||
pch_types)
|
||||
delete_file_types("build-vc80/newview/Debug", build_types)
|
||||
delete_file_types("build-vc80/newview/secondlife-bin.dir/Debug/",
|
||||
pch_types)
|
||||
|
||||
|
||||
delete_file_types("build-vc80/test/RelWithDebInfo", build_types)
|
||||
delete_file_types("build-vc80/test/test.dir/RelWithDebInfo/",
|
||||
pch_types)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Loading…
Reference in New Issue