Compare commits

..

4 Commits
1.3.2 ... MT

7 changed files with 24 additions and 15 deletions

View File

@ -79,7 +79,7 @@ endif
ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE)))) ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE))))
EXE_SUFFIX := .exe EXE_SUFFIX := .exe
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,lib) LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,a)
else else
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),$(if $(findstring -apple-darwin,$(MACHINE)),dylib,so),a) LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),$(if $(findstring -apple-darwin,$(MACHINE)),dylib,so),a)
endif endif
@ -107,7 +107,7 @@ ifneq (,$(firstword $(filter %-pc-haiku %-unknown-haiku,$(MACHINE))))
endif endif
APP_CFLAGS = $(CFLAGS) APP_CFLAGS = $(CFLAGS)
APP_LDFLGS = $(LDFLGS) -L$(SUBDIR_LIB)/lib -l$(VERSION_LIB) APP_LDFLGS = -L$(SUBDIR_LIB)/lib -l$(VERSION_LIB) $(LDFLGS)
LIB_CFLAGS = $(CFLAGS) LIB_CFLAGS = $(CFLAGS)
LIB_LDFLGS = $(LDFLGS) LIB_LDFLGS = $(LDFLGS)

View File

@ -15,7 +15,11 @@ fi
rm -rf "out" && mkdir -p "out" rm -rf "out" && mkdir -p "out"
mk_slunk "i686" "i686-gnu" "MARCH=pentiumpro MTUNE=pentium3" if [ "$(arch)" == "x86_64" ]; then
mk_slunk "x86_64" "x86_64-gnu" "MARCH=x86-64 MTUNE=nocona"
else
mk_slunk "i686" "i686-gnu" "MARCH=pentiumpro MTUNE=pentium3"
fi
./etc/build/build_info.sh "gcc" > "out/.build_info" ./etc/build/build_info.sh "gcc" > "out/.build_info"

View File

@ -3,7 +3,7 @@ set -e
cd -- "$(dirname -- "${0}")/../../.." cd -- "$(dirname -- "${0}")/../../.."
if [ -z "${cc_path}" ]; then if [ -z "${cc_path}" ]; then
cc_path="/usr/pkg/gcc13/bin/gcc" cc_path="/usr/pkg/gcc14/bin/gcc"
fi fi
mk_slunk() { mk_slunk() {

View File

@ -3,7 +3,7 @@ set -e
cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../../.." cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../../.."
if [ -z "${cc_path}" ]; then if [ -z "${cc_path}" ]; then
cc_path="/usr/gcc/13/bin/gcc" cc_path="/usr/gcc/14/bin/gcc"
fi fi
mk_slunk() { mk_slunk() {

View File

@ -23,10 +23,10 @@ fi
mk_slunk() { mk_slunk() {
make -B CC="${cc_path}" MARCH=${2} MTUNE=${3} STATIC=1 STRIP=1 FLTO=${use_flto} make -B CC="${cc_path}" MARCH=${2} MTUNE=${3} STATIC=1 STRIP=1 FLTO=${use_flto}
cp -vf "frontend/bin/slunkcrypt" "out/_next_/slunkcrypt-${1}" cp -vf "frontend/bin/slunkcrypt" "out/slunkcrypt-${1}"
} }
mkdir -p "out/_next_" mkdir -p "out"
case "${machine}" in case "${machine}" in
x86_64*) x86_64*)
@ -41,9 +41,9 @@ case "${machine}" in
esac esac
if [[ "${machine}" == *"-cygwin" ]]; then if [[ "${machine}" == *"-cygwin" ]]; then
cp -vfu "$(which cygwin1.dll)" "out/_next_" cp -vfu "$(which cygwin1.dll)" "out"
fi fi
./etc/build/build_info.sh "${cc_path}" > "out/_next_/.build_info" ./etc/build/build_info.sh "${cc_path}" > "out/.build_info"
echo "Build completed successfully." echo "Build completed successfully."

View File

@ -6,7 +6,6 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using com.muldersoft.slunkcrypt.gui.utils; using com.muldersoft.slunkcrypt.gui.utils;
namespace com.muldersoft.slunkcrypt.gui.process namespace com.muldersoft.slunkcrypt.gui.process
@ -87,7 +86,7 @@ namespace com.muldersoft.slunkcrypt.gui.process
string.Equals(fileVersion.CompanyName, "Muldersoft", StringComparison.OrdinalIgnoreCase) && string.Equals(fileVersion.CompanyName, "Muldersoft", StringComparison.OrdinalIgnoreCase) &&
(fileVersion.FileMajorPart == appVersion.Major) && (fileVersion.FileMinorPart == appVersion.Minor)) (fileVersion.FileMajorPart == appVersion.Major) && (fileVersion.FileMinorPart == appVersion.Minor))
{ {
success = (fileVersion.FilePrivatePart >= appVersion.Revision); success = ToVersion64(fileVersion.FileBuildPart, fileVersion.FilePrivatePart) >= ToVersion64(appVersion.Build, appVersion.Revision);
} }
} }
finally finally
@ -101,5 +100,10 @@ namespace com.muldersoft.slunkcrypt.gui.process
catch { } catch { }
return success; return success;
} }
static ulong ToVersion64(int upper, int lower)
{
return (Convert.ToUInt64(upper) << 32) | Convert.ToUInt64(lower);
}
} }
} }

View File

@ -23,10 +23,11 @@ namespace com.muldersoft.slunkcrypt.gui.utils
public static new string ToString() public static new string ToString()
{ {
Version version = m_version.Value; Version value = Version;
return string.Format( string versionString = string.Format(
(version.Revision > 0) ? "Version {0:D}.{1:D}.{2:D}, built on {3}" : "Version {0:D}.{1:D}, built on {3}", ((value.Revision > 0) || (value.Build > 0)) ? ((value.Build > 0) ? "{0:D}.{1:D}.{2:D}.{3:D}" : "{0:D}.{1:D}.{3:D}") : "{0:D}.{1:D}",
version.Major, version.Minor, version.Revision, BuildDate.ToString("yyyy-MM-dd")); value.Major, value.Minor, value.Build, value.Revision);
return string.Format("Version {0}, built on {1}", versionString, BuildDate.ToString("yyyy-MM-dd"));
} }
// ============================================================================= // =============================================================================