vs2019 updates

switch to local fs-build-variables clone use local autobuild-1.1 repo fix shell; autobuild cache
humbletim · Mar 17, 2021 · d938e6a · d938e6a
1 parent a0b5d11
commit d938e6a
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 74 deletions.
diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml
diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml
@@ -10,55 +10,94 @@ jobs:
   windows_build:
     runs-on: windows-latest
     env:
-      AUTOBUILD_VSVER: 120
+      FSVS_TARGET: 'Visual Studio 16 2019'
+      AUTOBUILD_VSVER: 164
       PreferredToolArchitecture: x64
       VIEWER_CHANNEL: FirestormVR-GHA
-      VIEWER_VERSION_REVISION: 60799
-
+      VIEWER_VERSION_REVISION: 63251
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Set env
+      shell: cmd
+      run: |
+        echo %cd%
+        df -h
+        mkdir c:\cache
+        mkdir c:\cache\autobuild
+
+        mkdir build-vc${{ env.AUTOBUILD_VSVER }}-64
+        cd build-vc${{ env.AUTOBUILD_VSVER }}-64
+        mkdir c:\cache\packages
+        mklink /j packages c:\cache\packages
+
+        mkdir c:\build
+        mkdir c:\build\newview
+        mklink /j newview c:\build\newview
+        cd ..
+
+        dir build-vc${{ env.AUTOBUILD_VSVER }}-64
+        dir
+        echo AUTOBUILD_ID=->> %GITHUB_ENV%
+        echo AUTOBUILD_INSTALLABLE_CACHE=c:\cache\autobuild>> %GITHUB_ENV%
+        echo AUTOBUILD_VARIABLES_FILE=%cd%\fs-build-variables\variables>> %GITHUB_ENV%
     - name: Set VIEWER_VERSION_GITHASH
       shell: bash
       run: |
         majorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 1`
         minorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 2`
         patchVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 3`
-        echo ::set-env name=VIEWER_VERSION_STR::${majorVer}.${minorVer}.${patchVer}.${VIEWER_VERSION_REVISION}
-        echo ::set-env name=VIEWER_VERSION_GITHASH::$(git log -n 1 | grep "Merge " | awk '{ print $2 }' | xargs git rev-parse --short || git rev-parse --short HEAD)
-    - name: Set env
-      shell: cmd
-      run: |
-        echo ::set-env name=AUTOBUILD_ID::-
-        echo ::set-env name=AUTOBUILD_VARIABLES_FILE::%cd%\fs-build-variables\variables
-    - name: Download VS2013 Community
-      run: choco install visualstudiocommunity2013
+        echo VIEWER_VERSION_STR=${majorVer}.${minorVer}.${patchVer}.${VIEWER_VERSION_REVISION} >> $GITHUB_ENV
+        echo VIEWER_VERSION_GITHASH=$(git log -n 1 | grep "Merge " | awk '{ print $2 }' | xargs git rev-parse --short || git rev-parse --short HEAD) >> $GITHUB_ENV
+        df -h
+    - name: Setup vsdevenv
+      uses: seanmiddleditch/gha-setup-vsdevenv@master
+    - name: Setup MSBuild
+      uses: microsoft/[email protected]
     - name: Setup python
       uses: actions/setup-python@v2
       with:
         python-version: 2.7
         architecture: x64
     - name: Get software versions please
+      shell: cmd
       run: |
+        echo AUTOBUILD_INSTALLABLE_CACHE='%AUTOBUILD_INSTALLABLE_CACHE%'
         cmake --version
         git --version
         python --version
+        cl.exe
+        MSBuild.exe -version
+        echo " "
+        df -h
     - name: Install autobuild through PIP
-      run: pip install git+https://vcs.firestormviewer.org/autobuild-1.1#egg=autobuild
+      run: pip install git+https://github.com/humbletim/autobuild-1.1#egg=autobuild
+
+    - name: cache -- autobuild downloaded installables
+      id: cacheddownloads
+      uses: actions/cache@v2
+      with:
+        path: ${{ env.AUTOBUILD_INSTALLABLE_CACHE }}
+        key: ${{ runner.os }}-cacheddownloads-${{ hashFiles('autobuild.xml') }}-${{ env.VIEWER_CHANNEL }}
+    - name: cache -- packages cache
+      id: cachedpackages
+      uses: actions/cache@v2
+      with:
+        path: c:\cache\packages
+        key: ${{ runner.os }}-cachedpackages-${{ hashFiles('autobuild.xml') }}-${{ env.VIEWER_CHANNEL }}
+
     - name: Configure autobuild
       shell: cmd
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
         autobuild --version
-        autobuild configure -A 64 -c ReleaseFS_open -- --package --openal --chan ${{env.VIEWER_CHANNEL}} -DLL_TESTS:BOOL=FALSE
+        autobuild configure -A 64 -c ReleaseFS_open -- --package --openal --chan ${{ env.VIEWER_CHANNEL }} -DLL_TESTS:BOOL=FALSE -DVS_DISABLE_FATAL_WARNINGS=ON
     - name: Build & Package
       shell: cmd
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
-        msbuild build-vc120-64/Firestorm.sln /target:llpackage /property:Configuration=Release;Platform=x64 /maxcpucount
+        msbuild build-vc${{ env.AUTOBUILD_VSVER }}-64/Firestorm.sln /target:llpackage /property:Configuration=Release;Platform=x64 /maxcpucount
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
-        name: windows-${{env.VIEWER_CHANNEL}}-${{env.VIEWER_VERSION_STR}}-${{env.VIEWER_VERSION_GITHASH}}
-        path: build-vc120-64/newview/Release/*_Setup.exe
+        name: windows-${{ env.VIEWER_CHANNEL }}-${{ env.VIEWER_VERSION_STR }}-${{ env.VIEWER_VERSION_GITHASH }}
+        path: build-vc${{ env.AUTOBUILD_VSVER }}-64/newview/Release/*_Setup.exe
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/ValveSoftware/openvr
 [submodule "fs-build-variables"]
 	path = fs-build-variables
-	url = https://vcs.firestormviewer.org/fs-build-variables
+	url = https://github.com/humbletim/fs-build-variables
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
@@ -293,4 +293,24 @@ else (USESYSTEMLIBS)
       )
 endif (USESYSTEMLIBS)
 
+if (NOT GENERATE_DEBUG_SYMBOLS)
+  message(WARNING "DISENGAGING DEBUG SYMBOL GENERATION (removing /Z[oiI7]..)")
+    #string(REGEX REPLACE "/Z[oiI7]" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    string(REGEX REPLACE "/Z[oiI7]|/DEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+    string(REGEX REPLACE "/Z[oiI7]|/DEBUG" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    string(REGEX REPLACE "/DEBUG(:[A-Z]+)?|/OPT:REF|/FORCE:MULTIPLE " "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+    string(REGEX REPLACE "/DEBUG(:[A-Z]+)?|/OPT:REF|/FORCE:MULTIPLE " "" CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
+    string(REGEX REPLACE "/DEBUG(:[A-Z]+)?|/OPT:REF|/FORCE:MULTIPLE " "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:NONE /INCREMENTAL:NO")
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} /DEBUG:NONE /INCREMENTAL:NO")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:NONE /INCREMENTAL:NO")
+
+    message(STATUS
+      "== CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}\n"
+      "== CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}\n"
+      "== CMAKE_CXX_LINKER_FLAGS ${CMAKE_CXX_LINKER_FLAGS}\n"
+      "== CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}]\n"
+    )
+endif()
+
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
@@ -2807,7 +2807,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
 
   else (NOT BUGSPLAT_DB)
     # BugSplat symbol-file generation
-    if (WINDOWS)
+    if (NO) #WINDOWS)
       # Just pack up a tarball containing only the .pdb file for the
       # executable. Because we intend to use cygwin tar, we must render
       # VIEWER_SYMBOL_FILE in cygwin path syntax.
@@ -2833,7 +2833,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         )
       add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME})
       add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})
-    endif (WINDOWS)
+    endif()
     if (DARWIN)
       # Have to run dsymutil first, then pack up the resulting .dSYM directory
       add_custom_command(OUTPUT "${VIEWER_APP_DSYM}"

diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py
@@ -111,6 +111,7 @@ def fs_linux_tar_excludes(self):
         return "--exclude=%s/bin/.debug" % installer_name
 
     def fs_save_windows_symbols(self):
+        return
         self.fs_save_symbols("windows")
 
         pdbName = "firestorm-bin.pdb"
@@ -164,6 +165,7 @@ def fs_save_osx_symbols( self ):
         self.fs_save_symbols("darwin")
 
     def fs_save_symbols(self, osname):
+        return
         if (os.path.exists("%s/firestorm-symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(),
                                                                        osname,
                                                                        self.address_size))):

diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
@@ -533,7 +533,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         UNATTENDED="-DUNATTENDED=ON"
     fi
 
-    cmake -G "$TARGET" ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TESTBUILD $PACKAGE \
+    cmake -G "${FSVS_TARGET:-$TARGET}" ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TESTBUILD $PACKAGE \
           $UNATTENDED -DLL_TESTS:BOOL=OFF -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
           $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee $LOG