Skip to content
Snippets Groups Projects
Commit b32b8b78 authored by Veit Berwig's avatar Veit Berwig :zzz:
Browse files

inst.nsi ersetzen

parent 199df6ad
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ Unicode true ...@@ -37,7 +37,7 @@ Unicode true
# MODIFIED FOR VS-NFD CONFIGURATION BY vitusb in 20250106 --- BEGIN --- # MODIFIED FOR VS-NFD CONFIGURATION BY vitusb in 20250106 --- BEGIN ---
# Got vars below from "gnupg-w32-x.x.xx.src\build-aux\speedo.mk" ... # Got vars below from "gnupg-w32-x.x.xx.src\build-aux\speedo.mk" ...
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Line 287: (build-release: gnupg-2.2.45) # Line 287: (build-release: gnupg-2.2.46)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# # Directory names. # # Directory names.
# They must be absolute, as we switch directories pretty often. # They must be absolute, as we switch directories pretty often.
...@@ -57,7 +57,7 @@ Unicode true ...@@ -57,7 +57,7 @@ Unicode true
# patdir := $(topsrc)/build-aux/speedo/patches # patdir := $(topsrc)/build-aux/speedo/patches
# w32src := $(topsrc)/build-aux/speedo/w32 # w32src := $(topsrc)/build-aux/speedo/w32
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Line 1371: (build-release: gnupg-2.2.45) # Line 1371: (build-release: gnupg-2.2.46)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# $(MAKENSIS) -V2 \ # $(MAKENSIS) -V2 \
# -DINST_DIR=$(idir) \ # -DINST_DIR=$(idir) \
...@@ -78,7 +78,7 @@ Unicode true ...@@ -78,7 +78,7 @@ Unicode true
# ${VERSION} was taken from: # ${VERSION} was taken from:
# gnupg-w32-x.x.xx.src\configure # gnupg-w32-x.x.xx.src\configure
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Line 583: PACKAGE_VERSION='2.2.45' # Line 583: PACKAGE_VERSION='2.2.46'
# Line 2921: VERSION=$PACKAGE_VERSION # Line 2921: VERSION=$PACKAGE_VERSION
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# 1.) ${PROD_VERSION} was taken from ... # 1.) ${PROD_VERSION} was taken from ...
...@@ -105,11 +105,11 @@ Unicode true ...@@ -105,11 +105,11 @@ Unicode true
# Line 15985: BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,` # Line 15985: BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# 4.) ... that produces the string by a "tr"-filter: # 4.) ... that produces the string by a "tr"-filter:
# echo "2.2.45.36415" | tr . , # echo "2.2.46.32328" | tr . ,
# 2,2,45,36415 # 2,2,46,32328
# 5.) ... with a "sed" filter by: # 5.) ... with a "sed" filter by:
# echo "2,2,45,36415" | sed 's/,/./g' # echo "2,2,46,32328" | sed 's/,/./g'
# 2.2.45.36415 # 2.2.46.32328
# #
# MAKE CHANGES HERE --- BEGIN --- # MAKE CHANGES HERE --- BEGIN ---
...@@ -141,8 +141,8 @@ Unicode true ...@@ -141,8 +141,8 @@ Unicode true
# - Rename ".\PLAY\inst\lib\libnpth.imp" to "libnpth.dll.a" # - Rename ".\PLAY\inst\lib\libnpth.imp" to "libnpth.dll.a"
# - Rename ".\PLAY\inst\bin\pinentry-basic.exe" to "pinentry-w32.exe" # - Rename ".\PLAY\inst\bin\pinentry-basic.exe" to "pinentry-w32.exe"
!define My_VERSION "2.2.45" !define My_VERSION "2.2.46"
!define My_PROD_VERSION "2.2.45.36415" !define My_PROD_VERSION "2.2.46.32328"
!define My_TOP_SRCDIR "_" # gnupg-w32-x.x.xx.src\PLAY\build !define My_TOP_SRCDIR "_" # gnupg-w32-x.x.xx.src\PLAY\build
!define My_BUILD_DIR "${My_TOP_SRCDIR}\PLAY\build" # gnupg-w32-x.x.xx.src\PLAY\build !define My_BUILD_DIR "${My_TOP_SRCDIR}\PLAY\build" # gnupg-w32-x.x.xx.src\PLAY\build
...@@ -158,11 +158,11 @@ Unicode true ...@@ -158,11 +158,11 @@ Unicode true
# "gnupg-w32-x.x.xx.src\build-aux\speedo.mk" # "gnupg-w32-x.x.xx.src\build-aux\speedo.mk"
# Line 841: BUILD_ISODATE=$(shell date -u +%Y-%m-%d) # Line 841: BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
# Line 842: BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE)) # Line 842: BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE))
# BUILD_ISODATE is like: 2024-10-22 # BUILD_ISODATE is like: 2025-01-07
# BUILD_DATESTR is like: 20241022 # BUILD_DATESTR is like: 20250107
!define My_BUILD_ISODATE "2024-10-22" # BUILD_ISODATE=$(shell date -u +%Y-%m-%d) !define My_BUILD_ISODATE "2025-01-07" # BUILD_ISODATE=$(shell date -u +%Y-%m-%d)
!define My_BUILD_DATESTR "20241022" # BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE)) !define My_BUILD_DATESTR "20250107" # BUILD_DATESTR=$(subst -,,$(BUILD_ISODATE))
# "NAME" was taken from "INST_NAME" in: # "NAME" was taken from "INST_NAME" in:
# "gnupg-w32-x.x.xx.src\build-aux\speedo.mk" # "gnupg-w32-x.x.xx.src\build-aux\speedo.mk"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment