Merge PR #81: buildenv/1.3.x: merge Windows directories in a single one

mumble-voip · Sep 24, 2018 · 8c4ba93 · 8c4ba93
2 parents cbaa3c6 + 0bcbb4b
commit 8c4ba93
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 115 deletions.
diff --git a/buildenv/1.3.x/win32-static-debug/build-all.bash b/buildenv/1.3.x/win32-static-debug/build-all.bash
diff --git a/buildenv/1.3.x/win32-static-no-ltcg/build-all.bash b/buildenv/1.3.x/win32-static-no-ltcg/build-all.bash
diff --git a/buildenv/1.3.x/win64-static-debug/setup.cmd → ...nv/1.3.x/win32-static/setup-debug-x64.cmd b/buildenv/1.3.x/win64-static-debug/setup.cmd → ...nv/1.3.x/win32-static/setup-debug-x64.cmd
@@ -1,4 +1,4 @@
-:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
+:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
 :: Use of this source code is governed by a BSD-style license that
 :: can be found in the LICENSE file in the source tree or at
 :: <http://mumble.info/mumble-releng/LICENSE>.
@@ -10,6 +10,4 @@
 
 set WANT_WIN64_BUILDENV=1
 set WANT_DEBUG_BUILDENV=1
-set SETUP_DIR=%~dp0
-cd %SETUP_DIR%\..\win32-static
 setup.cmd %*
diff --git a/buildenv/1.3.x/win32-static-debug/setup.cmd → buildenv/1.3.x/win32-static/setup-debug.cmd b/buildenv/1.3.x/win32-static-debug/setup.cmd → buildenv/1.3.x/win32-static/setup-debug.cmd
@@ -1,4 +1,4 @@
-:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
+:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
 :: Use of this source code is governed by a BSD-style license that
 :: can be found in the LICENSE file in the source tree or at
 :: <http://mumble.info/mumble-releng/LICENSE>.
@@ -9,6 +9,4 @@
 @echo off
 
 set WANT_DEBUG_BUILDENV=1
-set SETUP_DIR=%~dp0
-cd %SETUP_DIR%\..\win32-static
 setup.cmd %*
diff --git a/...denv/1.3.x/win32-static-no-ltcg/setup.cmd → .../1.3.x/win32-static/setup-no-ltcg-x64.cmd b/...denv/1.3.x/win32-static-no-ltcg/setup.cmd → .../1.3.x/win32-static/setup-no-ltcg-x64.cmd
@@ -1,4 +1,4 @@
-:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
+:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
 :: Use of this source code is governed by a BSD-style license that
 :: can be found in the LICENSE file in the source tree or at
 :: <http://mumble.info/mumble-releng/LICENSE>.
@@ -8,7 +8,6 @@
 
 @echo off
 
+set WANT_WIN64_BUILDENV=1
 set WANT_NO_LTCG=1
-set SETUP_DIR=%~dp0
-cd %SETUP_DIR%\..\win32-static
 setup.cmd %*
diff --git a/buildenv/1.3.x/win32-static/setup-no-ltcg.cmd b/buildenv/1.3.x/win32-static/setup-no-ltcg.cmd
@@ -0,0 +1,12 @@
+:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that
+:: can be found in the LICENSE file in the source tree or at
+:: <http://mumble.info/mumble-releng/LICENSE>.
+
+:: setup.cmd sets up a new Mumble build environment
+:: in the user's home directory (%USERPROFILE%).
+
+@echo off
+
+set WANT_NO_LTCG=1
+setup.cmd %*
diff --git a/buildenv/1.3.x/win32-static/setup-x64.cmd b/buildenv/1.3.x/win32-static/setup-x64.cmd
@@ -0,0 +1,12 @@
+:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that
+:: can be found in the LICENSE file in the source tree or at
+:: <http://mumble.info/mumble-releng/LICENSE>.
+
+:: setup.cmd sets up a new Mumble build environment
+:: in the user's home directory (%USERPROFILE%).
+
+@echo off
+
+set WANT_WIN64_BUILDENV=1
+setup.cmd %*
diff --git a/buildenv/1.3.x/win64-static-debug/build-all.bash b/buildenv/1.3.x/win64-static-debug/build-all.bash
diff --git a/buildenv/1.3.x/win64-static-no-ltcg/build-all.bash b/buildenv/1.3.x/win64-static-no-ltcg/build-all.bash
diff --git a/buildenv/1.3.x/win64-static-no-ltcg/setup.cmd b/buildenv/1.3.x/win64-static-no-ltcg/setup.cmd
diff --git a/buildenv/1.3.x/win64-static/build-all.bash b/buildenv/1.3.x/win64-static/build-all.bash
diff --git a/buildenv/1.3.x/win64-static/setup.cmd b/buildenv/1.3.x/win64-static/setup.cmd