forked from Mirrors/openclonk
Drop unused C4VERSIONBUILDNAME and C4ENGINEINFO
This was used to name snapshot releases of the Network2 branch, and has seen almost no use since. C4ENGINEINFO(LONG) was a duplicate of C4ENGINENAME and C4ENGINECAPTION.shapetextures
parent
0ef4e71363
commit
16ef28e05f
|
@ -1507,7 +1507,7 @@ find_program(MAKENSIS makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS])
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT setup_openclonk.exe
|
OUTPUT setup_openclonk.exe
|
||||||
COMMAND ${MAKENSIS} -NOCD -DSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} -DPROGRAMFILES=$PROGRAMFILES "-DPRODUCT_NAME=${C4ENGINENAME}${C4VERSIONBUILDNAME}" "-DPRODUCT_COMPANY=${C4PROJECT}" "-DCLONK=$<TARGET_FILE_DIR:openclonk>\\$<TARGET_FILE_NAME:openclonk>" "-DC4GROUP=$<TARGET_FILE_DIR:c4group>\\$<TARGET_FILE_NAME:c4group>" ${CMAKE_CURRENT_SOURCE_DIR}/tools/install/oc.nsi "-XOutFile setup_openclonk.exe"
|
COMMAND ${MAKENSIS} -NOCD -DSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} -DPROGRAMFILES=$PROGRAMFILES "-DPRODUCT_NAME=${C4ENGINENAME}" "-DPRODUCT_COMPANY=${C4PROJECT}" "-DCLONK=$<TARGET_FILE_DIR:openclonk>\\$<TARGET_FILE_NAME:openclonk>" "-DC4GROUP=$<TARGET_FILE_DIR:c4group>\\$<TARGET_FILE_NAME:c4group>" ${CMAKE_CURRENT_SOURCE_DIR}/tools/install/oc.nsi "-XOutFile setup_openclonk.exe"
|
||||||
MAIN_DEPENDENCY
|
MAIN_DEPENDENCY
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tools/install/oc.nsi
|
${CMAKE_CURRENT_SOURCE_DIR}/tools/install/oc.nsi
|
||||||
DEPENDS
|
DEPENDS
|
||||||
|
|
|
@ -28,8 +28,3 @@ SET(C4XVER2 0)
|
||||||
# Set this variable to any string for pre-release versions, like "alpha" or
|
# Set this variable to any string for pre-release versions, like "alpha" or
|
||||||
# "rc1". Don't supply a value for release versions.
|
# "rc1". Don't supply a value for release versions.
|
||||||
SET(C4VERSIONEXTRA "alpha0")
|
SET(C4VERSIONEXTRA "alpha0")
|
||||||
|
|
||||||
# C4VERSIONBUILDNAME should be witty and somewhat frequently changing
|
|
||||||
# for alpha and beta releases, and meaningful and stable for stable releases.
|
|
||||||
# This variable needs to start with a space if it isn't empty.
|
|
||||||
SET(C4VERSIONBUILDNAME "")
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ SET(C4COPYRIGHT_YEAR ${YEARFIXED})
|
||||||
# Build version strings
|
# Build version strings
|
||||||
############################################################################
|
############################################################################
|
||||||
SET(C4ENGINEID "${C4PROJECT_TLD}.${C4PROJECT_DOMAIN}.${C4ENGINENICK}")
|
SET(C4ENGINEID "${C4PROJECT_TLD}.${C4PROJECT_DOMAIN}.${C4ENGINENICK}")
|
||||||
set(C4ENGINEINFO "${C4ENGINENAME}")
|
|
||||||
set(C4ENGINECAPTION "${C4ENGINENAME}")
|
set(C4ENGINECAPTION "${C4ENGINENAME}")
|
||||||
|
|
||||||
set(C4VERSION "${C4XVER1}.${C4XVER2}")
|
set(C4VERSION "${C4XVER1}.${C4XVER2}")
|
||||||
|
@ -44,10 +43,6 @@ if(C4VERSIONEXTRA)
|
||||||
set(C4VERSION "${C4VERSION}-${C4VERSIONEXTRA}")
|
set(C4VERSION "${C4VERSION}-${C4VERSIONEXTRA}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(C4VERSIONBUILDNAME)
|
|
||||||
set(C4ENGINECAPTION "${C4ENGINECAPTION} ${C4VERSIONBUILDNAME}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(C4VERSION "${C4VERSION} win")
|
set(C4VERSION "${C4VERSION} win")
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
#endif
|
#endif
|
||||||
#define C4BUILDOPT C4BUILDDEBUG
|
#define C4BUILDOPT C4BUILDDEBUG
|
||||||
|
|
||||||
#define C4ENGINEINFOLONG "@C4ENGINEINFO@"
|
|
||||||
#define C4ENGINECAPTION "@C4ENGINECAPTION@"
|
#define C4ENGINECAPTION "@C4ENGINECAPTION@"
|
||||||
|
|
||||||
#define C4VERSION "@C4VERSION@" C4BUILDOPT
|
#define C4VERSION "@C4VERSION@" C4BUILDOPT
|
||||||
|
|
|
@ -102,7 +102,7 @@ bool C4Application::DoInit(int argc, char * argv[])
|
||||||
Revision.Ref(C4REVISION);
|
Revision.Ref(C4REVISION);
|
||||||
|
|
||||||
// Engine header message
|
// Engine header message
|
||||||
Log(C4ENGINEINFOLONG);
|
Log(C4ENGINECAPTION);
|
||||||
LogF("Version: %s %s (%s)", C4VERSION, C4_OS, Revision.getData());
|
LogF("Version: %s %s (%s)", C4VERSION, C4_OS, Revision.getData());
|
||||||
LogF("ExePath: \"%s\"", Config.General.ExePath.getData());
|
LogF("ExePath: \"%s\"", Config.General.ExePath.getData());
|
||||||
LogF("SystemDataPath: \"%s\"", Config.General.SystemDataPath);
|
LogF("SystemDataPath: \"%s\"", Config.General.SystemDataPath);
|
||||||
|
|
|
@ -156,7 +156,7 @@
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
<key>CFBundleInfoDictionaryVersion</key>
|
||||||
<string>6.0</string>
|
<string>6.0</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
<string>${C4ENGINEINFO}</string>
|
<string>${C4ENGINENAME}</string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
|
@ -181,7 +181,7 @@
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string>(c) ${C4COPYRIGHT_YEAR}, ${C4PROJECT}</string>
|
<string>(c) ${C4COPYRIGHT_YEAR}, ${C4PROJECT}</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
<string>${C4ENGINEINFO}</string>
|
<string>${C4ENGINENAME}</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>${C4VERSION}</string>
|
<string>${C4VERSION}</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
|
|
|
@ -109,7 +109,7 @@ size_t C4AulDebug::UnpackPacket(const StdBuf &rInBuf, const C4NetIO::addr_t &add
|
||||||
else if (!Password.getSize() || Password == Buf)
|
else if (!Password.getSize() || Password == Buf)
|
||||||
{
|
{
|
||||||
fConnected = true;
|
fConnected = true;
|
||||||
SendLine("HLO", "This is " C4ENGINEINFOLONG ", " C4VERSION);
|
SendLine("HLO", "This is " C4ENGINECAPTION ", " C4VERSION);
|
||||||
Log("C4Aul debugger connected successfully!");
|
Log("C4Aul debugger connected successfully!");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue