aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-05-24 21:59:28 -0700
committerRob Mensching <rob@firegiant.com>2022-05-24 22:44:20 -0700
commitea7b44abd725139535475a96dbcbc5b9c39539a2 (patch)
tree87e83edbfaa6c1877a907131c001f9dd58b9f2c1
parenta79996ed98978a6bf8f87020331ec5f95d9540bf (diff)
downloadwix-ea7b44abd725139535475a96dbcbc5b9c39539a2.tar.gz
wix-ea7b44abd725139535475a96dbcbc5b9c39539a2.tar.bz2
wix-ea7b44abd725139535475a96dbcbc5b9c39539a2.zip
Rename build.cmd to devbuild.cmd to better represent its purpose
The build.cmd in the root of the repository is intended for use by developers looking to build the full WiX Toolset. Official builds use the appropriate build files in the src folder. Renaming build.cmd to devbuild.cmd better represents its purpose. As a bonus, renaming to devbuild.cmd also removes TAB completion conflict with the .\build folder.
-rw-r--r--README.md8
-rw-r--r--build.cmd15
-rw-r--r--devbuild.cmd20
3 files changed, 22 insertions, 21 deletions
diff --git a/README.md b/README.md
index 2842fa8f..16b6fc80 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,7 @@ Visual Studio 2022 (17.0.4 or higher, NOT the preview release) with the followin
38##### To build the WiX toolset: 38##### To build the WiX toolset:
39 * Start a VS2022 'Developer Command Prompt' 39 * Start a VS2022 'Developer Command Prompt'
40 * Change directory to the root of the cloned repository 40 * Change directory to the root of the cloned repository
41 * Issue the command 'build clean' (NB - The build is stateful so it is always good practice to do the clean before building) 41 * Issue the command `devbuild` (or `devbuild release` if you want to create a release version)
42 * Issue the command 'build' (or 'build release' if you want to create a release version)
43 42
44 ##### Executing your newly built WiX toolset 43 ##### Executing your newly built WiX toolset
45 * 'build\wix\Debug\publish\wix\wix --help' (Of course changing Debug to Release if you built in Release mode) 44 * 'build\wix\Debug\publish\wix\wix --help' (Of course changing Debug to Release if you built in Release mode)
@@ -53,7 +52,4 @@ Visual Studio 2022 (17.0.4 or higher, NOT the preview release) with the followin
53 * If the develop branch has changed since you created your new branch rebase to the current development branch. 52 * If the develop branch has changed since you created your new branch rebase to the current development branch.
54 * If needed (ie, you squashed or rebased), do a force push of your branch 53 * If needed (ie, you squashed or rebased), do a force push of your branch
55 * Create a PR with your branch against the WiX4 repository. 54 * Create a PR with your branch against the WiX4 repository.
56 55 \ No newline at end of file
57
58
59
diff --git a/build.cmd b/build.cmd
deleted file mode 100644
index 2bd996cb..00000000
--- a/build.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
1@echo off
2
3setlocal
4pushd %~dp0
5
6:parse_args
7if /i "%1"=="release" set _C=Release
8if /i "%1"=="clean" set _CLEAN=1
9if not "%1"=="" shift & goto parse_args
10
11if not "%_CLEAN%"=="" src\clean.cmd
12src\build_all.cmd %_C%
13
14popd
15endlocal
diff --git a/devbuild.cmd b/devbuild.cmd
new file mode 100644
index 00000000..2f8ee880
--- /dev/null
+++ b/devbuild.cmd
@@ -0,0 +1,20 @@
1@echo off
2
3setlocal
4pushd %~dp0
5
6:parse_args
7if /i "%1"=="release" set _C=Release
8if /i "%1"=="inc" set _INCREMENTAL=1
9if /i "%1"=="incremental" set _INCREMENTAL=1
10if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1
11if not "%1"=="" shift & goto parse_args
12
13if not "%_INCREMENTAL"=="1" call src\clean.cmd
14if not "%_CLEAN%"=="" goto end
15
16src\build_all.cmd %_C%
17
18:end
19popd
20endlocal