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
Günther Brammer 2015-09-04 21:14:21 +02:00
parent 0ef4e71363
commit 16ef28e05f
7 changed files with 5 additions and 16 deletions

View File

@ -1507,7 +1507,7 @@ find_program(MAKENSIS makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS])
add_custom_command(
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
${CMAKE_CURRENT_SOURCE_DIR}/tools/install/oc.nsi
DEPENDS

View File

@ -28,8 +28,3 @@ SET(C4XVER2 0)
# Set this variable to any string for pre-release versions, like "alpha" or
# "rc1". Don't supply a value for release versions.
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 "")

View File

@ -35,7 +35,6 @@ SET(C4COPYRIGHT_YEAR ${YEARFIXED})
# Build version strings
############################################################################
SET(C4ENGINEID "${C4PROJECT_TLD}.${C4PROJECT_DOMAIN}.${C4ENGINENICK}")
set(C4ENGINEINFO "${C4ENGINENAME}")
set(C4ENGINECAPTION "${C4ENGINENAME}")
set(C4VERSION "${C4XVER1}.${C4XVER2}")
@ -44,10 +43,6 @@ if(C4VERSIONEXTRA)
set(C4VERSION "${C4VERSION}-${C4VERSIONEXTRA}")
endif()
if(C4VERSIONBUILDNAME)
set(C4ENGINECAPTION "${C4ENGINECAPTION} ${C4VERSIONBUILDNAME}")
endif()
if(WIN32)
set(C4VERSION "${C4VERSION} win")
elseif(APPLE)

View File

@ -42,7 +42,6 @@
#endif
#define C4BUILDOPT C4BUILDDEBUG
#define C4ENGINEINFOLONG "@C4ENGINEINFO@"
#define C4ENGINECAPTION "@C4ENGINECAPTION@"
#define C4VERSION "@C4VERSION@" C4BUILDOPT

View File

@ -102,7 +102,7 @@ bool C4Application::DoInit(int argc, char * argv[])
Revision.Ref(C4REVISION);
// Engine header message
Log(C4ENGINEINFOLONG);
Log(C4ENGINECAPTION);
LogF("Version: %s %s (%s)", C4VERSION, C4_OS, Revision.getData());
LogF("ExePath: \"%s\"", Config.General.ExePath.getData());
LogF("SystemDataPath: \"%s\"", Config.General.SystemDataPath);

View File

@ -156,7 +156,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${C4ENGINEINFO}</string>
<string>${C4ENGINENAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
@ -181,7 +181,7 @@
<key>NSHumanReadableCopyright</key>
<string>(c) ${C4COPYRIGHT_YEAR}, ${C4PROJECT}</string>
<key>CFBundleDisplayName</key>
<string>${C4ENGINEINFO}</string>
<string>${C4ENGINENAME}</string>
<key>CFBundleShortVersionString</key>
<string>${C4VERSION}</string>
<key>CFBundleVersion</key>

View File

@ -109,7 +109,7 @@ size_t C4AulDebug::UnpackPacket(const StdBuf &rInBuf, const C4NetIO::addr_t &add
else if (!Password.getSize() || Password == Buf)
{
fConnected = true;
SendLine("HLO", "This is " C4ENGINEINFOLONG ", " C4VERSION);
SendLine("HLO", "This is " C4ENGINECAPTION ", " C4VERSION);
Log("C4Aul debugger connected successfully!");
}
else