livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates for GHA to get windows to work. 

also requires python hackery pushed as separate commit pending a better solution.
master
Beq 2022-09-17 22:26:27 +01:00
parent 815bcc31b1
commit 9e19e6712b
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build_viewer.yml vendored
View File

@ -37,6 +37,11 @@ jobs:
with: with:
repository: FirestormViewer/fs-build-variables repository: FirestormViewer/fs-build-variables
path: build-variables path: build-variables
- name: set VSVER for Windows builds
if: runner.os == 'Windows'
run: echo "AUTOBUILD_VSVER=170" >> $GITHUB_ENV
shell: bash
- name: Install required Ubuntu packages - name: Install required Ubuntu packages
if: runner.os == 'Linux' if: runner.os == 'Linux'
@ -45,6 +50,9 @@ jobs:
- name: install autobuild - name: install autobuild
run: pip3 install git+https://github.com/Nicky-D/autobuild@main_nd run: pip3 install git+https://github.com/Nicky-D/autobuild@main_nd
- name: install autobuild
run: pip3 install llbase
- name: Configure - name: Configure
run: autobuild configure -c ReleaseFS -A${{matrix.addrsize}} -- --package --chan ${{github.ref_name}} ${{env.EXTRA_ARGS}} ${{env.FS_GRID}} run: autobuild configure -c ReleaseFS -A${{matrix.addrsize}} -- --package --chan ${{github.ref_name}} ${{env.EXTRA_ARGS}} ${{env.FS_GRID}}
shell: bash shell: bash
@ -59,8 +67,8 @@ jobs:
with: with:
name: ${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip name: ${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip
path: | path: |
build-vc150-*/newview/Release/*Setup.exe build-*/newview/Release/*Setup.exe
build-vc150-*/newview/Release/*.xz build-*/newview/Release/*.xz
- name: publish ${{ matrix.os }} artifacts - name: publish ${{ matrix.os }} artifacts
if: runner.os == 'Linux' if: runner.os == 'Linux'

17
scripts/configure_firestorm.sh
View File

@ -359,7 +359,10 @@ then
if [ "$OSTYPE" = "cygwin" ] ; then if [ "$OSTYPE" = "cygwin" ] ; then
export AUTOBUILD_EXEC="$(cygpath -u $AUTOBUILD)" export AUTOBUILD_EXEC="$(cygpath -u $AUTOBUILD)"
fi fi
if [ -z "$AUTOBUILD_EXEC" ]
then
export AUTOBUILD_EXEC=`which autobuild`
fi
# load autobuild provided shell functions and variables # load autobuild provided shell functions and variables
eval "$("$AUTOBUILD_EXEC" source_environment)" eval "$("$AUTOBUILD_EXEC" source_environment)"
# vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake
@ -605,9 +608,15 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
make -j $JOBS | tee -a $LOG make -j $JOBS | tee -a $LOG
fi fi
elif [ $TARGET_PLATFORM == "windows" ] ; then elif [ $TARGET_PLATFORM == "windows" ] ; then
msbuild.exe Firestorm.sln /p:Configuration=${BTYPE} /flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \ if [ "${AUTOBUILD_VSVER}" -ge 170 ] ; then
/flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" /p:Platform=${AUTOBUILD_WIN_VSPLATFORM} /t:Build /p:useenv=true \ msbuild.exe Firestorm.sln -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
/verbosity:normal /toolsversion:15.0 /p:"VCBuildAdditionalOptions= /incremental" -flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" -p:Platform=${AUTOBUILD_WIN_VSPLATFORM} -t:Build -p:useenv=true \
-verbosity:normal -toolsversion:Current -p:"VCBuildAdditionalOptions= /incremental"
else
msbuild.exe Firestorm.sln -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
-flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" -p:Platform=${AUTOBUILD_WIN_VSPLATFORM} -t:Build -p:useenv=true \
-verbosity:normal -toolsversion:15.0 -p:"VCBuildAdditionalOptions= /incremental"
fi
fi fi
fi fi