Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

pkgs/ultimatepp: rename to upp

Browse source
This commit is contained in:
Wroclaw 2025-05-25 20:43:16 +02:00
parent 35259d4999
commit 6d32f8da73
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

131
pkgs/by-name/ul/ultimatepp/no-build-info.patch
View file

@ -1,131 +0,0 @@
diff --git a b
index a3e9af6..0ff3dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,14 @@ all: prepare $(OutFile)
.PHONY: build_info
build_info:
- (date '+#define bmYEAR %y%n#define bmMONTH %m%n#define bmDAY %d%n#define bmHOUR %H%n#define bmMINUTE %M%n#define bmSECOND %S%n#define bmTIME Time( %y, %m, %d, %H, %M, %S )' | sed 's| 0\([[:digit:]]\)| \1|g' && \
- echo '#define bmMACHINE "'`hostname`'"' && \
- echo '#define bmUSER "'`whoami`'"') > "$(UPPOUT)/build_info.h"
+ (echo '#define bmYEAR 1970' && \
+ echo '#define bmMONTH 1' && \
+ echo '#define bmDAY 1' && \
+ echo '#define bmHOUR 0' && \
+ echo '#define bmMINUTE 0' && \
+ echo '#define bmSECOND 1' && \
+ echo '#define bmTIME Time(1970, 1, 1, 0, 0, 1)' && \
+ echo '#define bmMACHINE ""' && \
+ echo '#define bmUSER ""') > "$(UPPOUT)/build_info.h"
.PHONY: prepare
prepare: \
index a3e9af6..0ff3dd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,8 +100,14 @@ all: prepare $(OutFile)
.PHONY: build_info
build_info:
- (date '+#define bmYEAR %y%n#define bmMONTH %m%n#define bmDAY %d%n#define bmHOUR %H%n#define bmMINUTE %M%n#define bmSECOND %S%n#define bmTIME Time( %y, %m, %d, %H, %M, %S )' | sed 's| 0\([[:digit:]]\)| \1|g' && \
- echo '#define bmMACHINE "'`hostname`'"' && \
- echo '#define bmUSER "'`whoami`'"') > "$(UPPOUT)/build_info.h"
+ (echo '#define bmYEAR 1970' && \
+ echo '#define bmMONTH 1' && \
+ echo '#define bmDAY 1' && \
+ echo '#define bmHOUR 0' && \
+ echo '#define bmMINUTE 0' && \
+ echo '#define bmSECOND 1' && \
+ echo '#define bmTIME Time(1970, 1, 1, 0, 0, 1)' && \
+ echo '#define bmMACHINE ""' && \
+ echo '#define bmUSER ""') > "$(UPPOUT)/build_info.h"
.PHONY: prepare
prepare: \
--- a/umkMakefile
+++ b/umkMakefile
@@ -52,8 +52,14 @@ all: prepare $(OutFile)
.PHONY: build_info
build_info:
- (date '+#define bmYEAR %y%n#define bmMONTH %m%n#define bmDAY %d%n#define bmHOUR %H%n#define bmMINUTE %M%n#define bmSECOND %S%n#define bmTIME Time( %y, %m, %d, %H, %M, %S )' | sed 's| 0\([[:digit:]]\)| \1|g' && \
- echo '#define bmMACHINE "'`hostname`'"' && \
- echo '#define bmUSER "'`whoami`'"') > "$(UPPOUT)/build_info.h"
+ (echo '#define bmYEAR 1970' && \
+ echo '#define bmMONTH 1' && \
+ echo '#define bmDAY 1' && \
+ echo '#define bmHOUR 0' && \
+ echo '#define bmMINUTE 0' && \
+ echo '#define bmSECOND 1' && \
+ echo '#define bmTIME Time(1970, 1, 1, 0, 0, 1)' && \
+ echo '#define bmMACHINE ""' && \
+ echo '#define bmUSER ""') > "$(UPPOUT)/build_info.h"
.PHONY: prepare
prepare: \
--- a/umkMakefile.in
+++ b/umkMakefile.in
@@ -52,8 +52,14 @@ all: prepare $(OutFile)
.PHONY: build_info
build_info:
- (date '+#define bmYEAR %y%n#define bmMONTH %m%n#define bmDAY %d%n#define bmHOUR %H%n#define bmMINUTE %M%n#define bmSECOND %S%n#define bmTIME Time( %y, %m, %d, %H, %M, %S )' | sed 's| 0\([[:digit:]]\)| \1|g' && \
- echo '#define bmMACHINE "'`hostname`'"' && \
- echo '#define bmUSER "'`whoami`'"') > "$(UPPOUT)/build_info.h"
+ (echo '#define bmYEAR 1970' && \
+ echo '#define bmMONTH 1' && \
+ echo '#define bmDAY 1' && \
+ echo '#define bmHOUR 0' && \
+ echo '#define bmMINUTE 0' && \
+ echo '#define bmSECOND 1' && \
+ echo '#define bmTIME Time(1970, 1, 1, 0, 0, 1)' && \
+ echo '#define bmMACHINE ""' && \
+ echo '#define bmUSER ""') > "$(UPPOUT)/build_info.h"
.PHONY: prepare
prepare: \
--- a/uppsrc/ide/Builders/CppBuilder.cpp
+++ b/uppsrc/ide/Builders/CppBuilder.cpp
@@ -580,19 +580,32 @@ void CppBuilder::SaveBuildInfo(const String& package)
RealizePath(path);
FileOut info(path);
Time t = GetSysTime();
- info << "#define bmYEAR " << (int)t.year << "\r\n";
- info << "#define bmMONTH " << (int)t.month << "\r\n";
- info << "#define bmDAY " << (int)t.day << "\r\n";
- info << "#define bmHOUR " << (int)t.hour << "\r\n";
- info << "#define bmMINUTE " << (int)t.minute << "\r\n";
- info << "#define bmSECOND " << (int)t.second << "\r\n";
- info << Format("#define bmTIME Time(%d, %d, %d, %d, %d, %d)\r\n",
- (int)t.year, (int)t.month, (int)t.day, (int)t.hour, (int)t.minute, (int)t.second);
- info << "#define bmMACHINE " << AsCString(GetComputerName()) << "\r\n";
- info << "#define bmUSER " << AsCString(GetUserName()) << "\r\n";
-
- if(package == mainpackage)
- info << Join(RepoInfo(package), "\r\n");
+ char* no_build_info = getenv("NO_BUILD_INFO");
+ if((no_build_info != NULL) && strcmp(no_build_info, "1")) {
+ info << "#define bmYEAR " << (int)t.year << "\r\n";
+ info << "#define bmMONTH " << (int)t.month << "\r\n";
+ info << "#define bmDAY " << (int)t.day << "\r\n";
+ info << "#define bmHOUR " << (int)t.hour << "\r\n";
+ info << "#define bmMINUTE " << (int)t.minute << "\r\n";
+ info << "#define bmSECOND " << (int)t.second << "\r\n";
+ info << Format("#define bmTIME Time(%d, %d, %d, %d, %d, %d)\r\n",
+ (int)t.year, (int)t.month, (int)t.day, (int)t.hour, (int)t.minute, (int)t.second);
+ info << "#define bmMACHINE " << AsCString(GetComputerName()) << "\r\n";
+ info << "#define bmUSER " << AsCString(GetUserName()) << "\r\n";
+
+ if(package == mainpackage)
+ info << Join(RepoInfo(package), "\r\n");
+ } else {
+ info << "#define bmYEAR 1970\r\n";
+ info << "#define bmMONTH 1\r\n";
+ info << "#define bmDAY 1\r\n";
+ info << "#define bmHOUR 0\r\n";
+ info << "#define bmMINUTE 0\r\n";
+ info << "#define bmSECOND 1\r\n";
+ info << "#define bmTIME Time(1970, 1, 1, 0, 0, 1)\r\n";
+ info << "#define bmMACHINE \"\"\r\n";
+ info << "#define bmUSER \"\"\r\n";
+ }
}
String CppBuilder::DefinesTargetTime(const char *sep, const String& package, const Package& pkg)