Skip to content

Commit

Permalink
Issue #110 is tentatively done, portfix branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahlstromcj committed May 19, 2023
1 parent 49ba794 commit 0b4e92b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 13 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
2023-04-30
2023-05-20
0.99.5
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl \file configure.ac
dnl \library Seq66
dnl \author Chris Ahlstrom
dnl \date 2018-11-09
dnl \update 2023-05-11
dnl \update 2023-05-20
dnl \version $Revision$
dnl \license $XPC_SUITE_GPL_LICENSE$
dnl
Expand Down Expand Up @@ -480,7 +480,7 @@ dnl automatically for us.

AH_TOP(

#define VERSION_DATE_SHORT "2023-05-11"
#define VERSION_DATE_SHORT "2023-05-20"
#define API_VERSION "0.99"
#define VERSION "0.99.5"

Expand Down
4 changes: 2 additions & 2 deletions include/qt/portmidi/seq66-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* \library seq66 application
* \author Chris Ahlstrom
* \date 2018-11-10
* \updates 2023-04-30
* \updates 2023-05-20
* \license GNU GPLv2 or above
*
* Qt Portmidi Linux and Windows versions, hardwired for use with
Expand Down Expand Up @@ -62,7 +62,7 @@
#endif

#if ! defined SEQ66_VERSION_DATE_SHORT
#define SEQ66_VERSION_DATE_SHORT "2023-04-30"
#define SEQ66_VERSION_DATE_SHORT "2023-05-20"
#endif

#if ! defined SEQ66_API_VERSION
Expand Down
4 changes: 2 additions & 2 deletions include/qt/rtmidi/seq66-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* \library seq66 application
* \author Chris Ahlstrom
* \date 2020-05-31
* \updates 2023-04-30
* \updates 2023-05-20
* \license GNU GPLv2 or above
*
* Qt Rtmidi Linux and Windows versions, hardwired for use with
Expand Down Expand Up @@ -70,7 +70,7 @@
#endif

#if ! defined SEQ66_VERSION_DATE_SHORT
#define SEQ66_VERSION_DATE_SHORT "2023-04-30"
#define SEQ66_VERSION_DATE_SHORT "2023-05-20"
#endif

#if ! defined SEQ66_API_VERSION
Expand Down
10 changes: 10 additions & 0 deletions nsis/Seq66Constants.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@
!define PRODUCT_PUBLISHER "C. Ahlstrom (ahlstromcj@gmail.com)"
!define PRODUCT_WEB_SITE "https://github.com/ahlstromcj/seq66/"

;============================================================================
; The type of build to make. Uncomment the one desired. WIN64 preferred.
;============================================================================

!define WIN64
!define WINBITS "64"

; !define WIN32
; !define WINBITS "32"

;============================================================================
; Directory to place the installer.
;============================================================================
Expand Down
3 changes: 2 additions & 1 deletion nsis/Seq66Setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; File: Seq66Setup.nsi
; Author: Chris Ahlstrom
; Date: 2018-05-26
; Updated: 2023-05-08
; Updated: 2023-05-19
; Version: 0.99.5
;
; Usage of this Windows build script:
Expand Down Expand Up @@ -236,6 +236,7 @@ SectionEnd

Section -Post

SetRegView ${WINBITS}
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\qpseq66.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
Expand Down
19 changes: 14 additions & 5 deletions nsis/build_release_package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:: \library Seq66 for Windows
:: \author Chris Ahlstrom
:: \date 2018-05-26
:: \update 2023-05-10
:: \update 2023-05-19
:: \license $XPC_SUITE_GPL_LICENSE$
::
:: This script sets up and creates a release build of Seq66 for
Expand All @@ -23,6 +23,7 @@
::
:: 0. Decide whether to a 32-bit or a 64-bit build. Modify the
:: environment variables and steps below to accommodate your choice.
:: We might support only 64-bit builds at some point.
:: 1. Runs in Windows only.
:: 2. Requires QtCreator to be installed, and configured to provide
:: the 32/64-bit Mingw tools, including mingw32-make.exe (there is
Expand Down Expand Up @@ -82,7 +83,7 @@
:: "..\seq66\nsis\build_release_package.bat".
:: d. Or cd to the seq66\nsis directory and try
:: "build_release_package.bat > build.log 2>&1"
:: 6. The result is a file such as "qpseq66-release-package-0.90.1.7z".
:: 6. The result is a file such as "qpseq66-release-package-x64-0.90.1.7z".
:: It is found in seq66/../seq66-release-32/Seq66qt5. Also, a
:: log file is made in seq66/../seq66-release-32/make.log,
:: which can be checked for build warnings and errors. If you cannot
Expand All @@ -97,8 +98,8 @@
:: Here are the commands ("$" is the command-line prompt character):
::
:: seq66 $ rm -rf release/ # careful!
:: seq66 $ 7z x qpseq66-release-package-0.90.2.7z
:: seq66 $ mv qpseq66-release-package-0.90.2.7z ..
:: seq66 $ 7z x qpseq66-release-package-x64-0.90.2.7z
:: seq66 $ mv qpseq66-release-package-x64-0.90.2.7z ..
::
:: 9. Change to the seq66/nsis directory and run:
::
Expand Down Expand Up @@ -153,7 +154,15 @@

set PROJECT_VERSION=0.99.5
set PROJECT_DRIVE=C:

:: Set the bits of the project, either 64 or 32. Also define WIN64 versus
:: WIN32 in Seq66Constants.nsh.

set PROJECT_BITS=64

:: This is where the seq66 and the shadow build directories reside. Adjust
:: them for your setup.

set PROJECT_BASE=\Users\Chris\Documents\Home
set NSIS_PLATFORM=Windows

Expand All @@ -164,7 +173,7 @@ set PROJECT_NAME=seq66
set PROJECT_TREE=%PROJECT_BASE%\%PROJECT_NAME%
set PROJECT_REL_ROOT=..\seq66
set PROJECT_PRO=seq66.pro
set PROJECT_7ZIP=qpseq66-release-package-%PROJECT_VERSION%.7z
set PROJECT_7ZIP=qpseq66-release-package-x%PROJECT_BITS%-%PROJECT_VERSION%.7z
set SHADOW_DIR=seq66-release-%PROJECT_BITS%
set APP_DIR=Seq66qt5
set RELEASE_DIR=%APP_DIR%\release
Expand Down

0 comments on commit 0b4e92b

Please sign in to comment.