marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reduce version numbering from x.y.z (x does never changes) to y.z

issue1247
Tobias Zwick 2014-12-12 21:57:52 +01:00
parent 4fae398672
commit d59b1e5e5b
20 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1536,12 +1536,11 @@ add_custom_target(setup
set(CPACK_PACKAGE_NAME "openclonk")
set(CPACK_PACKAGE_VENDOR "${C4PROJECT_URL}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenClonk - A game mix out of tactic, strategy and Jump & Run")
set(CPACK_PACKAGE_VERSION "${C4XVER1}.${C4XVER2}.${C4XVER3}")
set(CPACK_PACKAGE_VERSION "${C4XVER1}.${C4XVER2}")
set(CPACK_PACKAGE_VERSION_MAJOR "${C4XVER1}")
set(CPACK_PACKAGE_VERSION_MINOR "${C4XVER2}")
set(CPACK_PACKAGE_VERSION_PATCH "${C4XVER3}")
set(CPACK_PACKAGE_FILE_NAME "openclonk-${C4XVER1}.${C4XVER2}.${C4XVER3}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "openclonk-src-${C4XVER1}.${C4XVER2}.${C4XVER3}")
set(CPACK_PACKAGE_FILE_NAME "openclonk-${C4XVER1}.${C4XVER2}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "openclonk-src-${C4XVER1}.${C4XVER2}")
set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
# Somebody who uses Debian/Ubuntu should set this
#set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libgcc1, libx11, libXrandr, libXpm, libGLEW, libGL, libpng, libSDL-1.2, libSDL_mixer-1.2, gtk2, libjpeg, zlib")

7
Version.txt
View File

@ -11,9 +11,8 @@ SET(C4ENGINENAME "OpenClonk")
SET(C4ENGINENICK "openclonk")
SET(C4ENGINEID "${C4PROJECT_TLD}.${C4PROJECT_DOMAIN}.${C4ENGINENICK}")
SET(C4XVER1 5)
SET(C4XVER2 5)
SET(C4XVER3 1)
SET(C4XVER1 6)
SET(C4XVER2 0)
# C4VERSIONBUILDNAME should be witty and somewhat frequently changing
# for alpha and beta releases, and meaningful and stable for stable releases.
@ -46,7 +45,7 @@ SET(C4COPYRIGHT_YEAR ${YEARFIXED})
SET(C4ENGINECAPTION "${C4ENGINENAME}{$C4VERSIONBUILDNAME}")
set(C4ENGINEINFO "${C4ENGINENAME}")
set(C4VERSION "${C4XVER1}.${C4XVER2}.${C4XVER3}")
set(C4VERSION "${C4XVER1}.${C4XVER2}")
if(C4XVER4 LESS 10)
set(C4VERSION "${C4VERSION} [00${C4XVER4}]")

9
src/C4Version.h.in
View File

@ -36,7 +36,6 @@
#define C4XVER1 @C4XVER1@
#define C4XVER2 @C4XVER2@
#define C4XVER3 @C4XVER3@
#define C4VERSIONBUILDNAME "@C4VERSIONBUILDNAME@"
#define C4VERSIONEXTRA "@C4VERSIONEXTRA@"
#define C4REVISION "@C4REVISION@"
@ -56,11 +55,11 @@
#define C4XVERTOC4XVERS(s) C4XVERTOC4XVERS2(s)
#define C4XVERTOC4XVERS2(s) #s
// if C4XVER3 >= 90, this is a pre-release version; add VCS revision
#if C4XVER3 >= 90
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) "." C4XVERTOC4XVERS(C4XVER3) " [" C4REVISION "]" C4VERSIONEXTRA C4BUILDOPT
// if C4XVER2 >= 90, this is a pre-release version; add VCS revision
#if C4XVER2 >= 90
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) " [" C4REVISION "]" C4VERSIONEXTRA C4BUILDOPT
#else
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) "." C4XVERTOC4XVERS(C4XVER3) C4VERSIONEXTRA C4BUILDOPT
#define C4VERSION C4XVERTOC4XVERS(C4XVER1) "." C4XVERTOC4XVERS(C4XVER2) C4VERSIONEXTRA C4BUILDOPT
#endif
// if this is set, add a build identifier to the logs and crash dumps

4
src/c4group/Resource.rc
View File

@ -14,8 +14,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION C4XVER1,C4XVER2,C4XVER3,0
PRODUCTVERSION C4XVER1,C4XVER2,C4XVER3,0
FILEVERSION C4XVER1,C4XVER2,0
PRODUCTVERSION C4XVER1,C4XVER2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L

5
src/control/C4GameSave.cpp
View File

@ -62,7 +62,6 @@ bool C4GameSave::SaveCore()
rC4S = Game.C4S;
// Always mark current engine version
rC4S.Head.C4XVer[0]=C4XVER1; rC4S.Head.C4XVer[1]=C4XVER2;
rC4S.Head.C4XVer[2]=C4XVER3;
// Some flags are not to be set for initial settings:
// They depend on whether specific runtime data is present, which may simply not be stored into initial
// saves, because they rely on any data present and up-to-date within the scenario!
@ -297,7 +296,7 @@ void C4GameSave::WriteDescGameTime(StdStrBuf &sBuf)
void C4GameSave::WriteDescEngine(StdStrBuf &sBuf)
{
char ver[32]; sprintf(ver, "%d.%d.%d", (int)C4XVER1, (int)C4XVER2, (int)C4XVER3);
char ver[32]; sprintf(ver, "%d.%d", (int)C4XVER1, (int)C4XVER2);
sBuf.AppendFormat(LoadResStr("IDS_DESC_VERSION"), ver);
WriteDescLineFeed(sBuf);
}
@ -539,7 +538,7 @@ void C4GameSaveRecord::AdjustCore(C4Scenario &rC4S)
rC4S.Head.Icon=29;
// default record title
char buf[1024 + 1];
sprintf(buf, "%03i %s [%d.%d.%d]", iNum, Game.ScenarioTitle.getData(), (int)C4XVER1, (int)C4XVER2, (int)C4XVER3);
sprintf(buf, "%03i %s [%d.%d]", iNum, Game.ScenarioTitle.getData(), (int)C4XVER1, (int)C4XVER2);
SCopy(buf, rC4S.Head.Title, C4MaxTitle);
}

6
src/game/C4Game.cpp
View File

@ -141,7 +141,7 @@ bool C4Game::InitDefs()
if (!iDefs) { LogFatal(LoadResStr("IDS_PRC_NODEFS")); return false; }
// Check def engine version (should be done immediately on def load)
iDefs=::Definitions.CheckEngineVersion(C4XVER1,C4XVER2,C4XVER3);
iDefs=::Definitions.CheckEngineVersion(C4XVER1,C4XVER2);
if (iDefs>0) { LogF(LoadResStr("IDS_PRC_DEFSINVC4X"),iDefs); }
// Check for unmet requirements
@ -199,9 +199,9 @@ bool C4Game::OpenScenario()
{ LogFatal(LoadResStr("IDS_PRC_FILEINVALID")); return false; }
// Check minimum engine version
if (CompareVersion(C4S.Head.C4XVer[0],C4S.Head.C4XVer[1],C4S.Head.C4XVer[2]) > 0)
if (CompareVersion(C4S.Head.C4XVer[0],C4S.Head.C4XVer[1]) > 0)
{
LogFatal(FormatString(LoadResStr("IDS_PRC_NOREQC4X"), C4S.Head.C4XVer[0],C4S.Head.C4XVer[1],C4S.Head.C4XVer[2]).getData());
LogFatal(FormatString(LoadResStr("IDS_PRC_NOREQC4X"), C4S.Head.C4XVer[0],C4S.Head.C4XVer[1]).getData());
return false;
}

21
src/game/C4GameVersion.h
View File

@ -23,16 +23,16 @@
struct C4GameVersion
{
ValidatedStdCopyStrBuf<C4InVal::VAL_NameAllowEmpty> sEngineName; // status only - not used for comparison
int32_t iVer[4];
int32_t iVer[2];
C4GameVersion(const char *szEngine=C4ENGINENAME, int32_t iVer1=C4XVER1, int32_t iVer2=C4XVER2, int32_t iVer3=C4XVER3)
{ Set(szEngine, iVer1, iVer2, iVer3); }
void Set(const char *szEngine=C4ENGINENAME, int32_t iVer1=C4XVER1, int32_t iVer2=C4XVER2, int32_t iVer3=C4XVER3)
{ sEngineName.CopyValidated(szEngine); iVer[0]=iVer1; iVer[1]=iVer2; iVer[2]=iVer3; }
C4GameVersion(const char *szEngine=C4ENGINENAME, int32_t iVer1=C4XVER1, int32_t iVer2=C4XVER2)
{ Set(szEngine, iVer1, iVer2); }
void Set(const char *szEngine=C4ENGINENAME, int32_t iVer1=C4XVER1, int32_t iVer2=C4XVER2)
{ sEngineName.CopyValidated(szEngine); iVer[0]=iVer1; iVer[1]=iVer2; }
StdStrBuf GetString() const
{ return FormatString("%s %d.%d.%d", sEngineName.getData(), (int)iVer[0], (int)iVer[1], (int)iVer[2]); }
{ return FormatString("%s %d.%d", sEngineName.getData(), (int)iVer[0], (int)iVer[1]); }
bool operator == (const C4GameVersion &rCmp) const
{ return /*sEngineName==rCmp.sEngineName &&*/ iVer[0]==rCmp.iVer[0] && iVer[1]==rCmp.iVer[1] && iVer[2]==rCmp.iVer[2]; }
{ return /*sEngineName==rCmp.sEngineName &&*/ iVer[0]==rCmp.iVer[0] && iVer[1]==rCmp.iVer[1]; }
void CompileFunc(StdCompiler *pComp, bool fEngineName)
{
@ -43,17 +43,16 @@ struct C4GameVersion
}
else if (pComp->isCompiler())
sEngineName = "";
pComp->Value(mkArrayAdapt(iVer,3,0));;
pComp->Value(mkArrayAdapt(iVer,2,0));
}
};
// helper
inline int CompareVersion(int iVer1, int iVer2, int iVer3,
int iRVer1 = C4XVER1, int iRVer2 = C4XVER2, int iRVer3 = C4XVER3)
inline int CompareVersion(int iVer1, int iVer2,
int iRVer1 = C4XVER1, int iRVer2 = C4XVER2)
{
if (iVer1 > iRVer1) return 1; if (iVer1 < iRVer1) return -1;
if (iVer2 > iRVer2) return 1; if (iVer2 < iRVer2) return -1;
if (iVer3 > iRVer3) return 1; if (iVer3 < iRVer3) return -1;
return 0;
}

4
src/gui/C4StartupNetDlg.cpp
View File

@ -864,7 +864,7 @@ void C4StartupNetDlg::UpdateMasterserver()
else
{
pMasterserverClient = new C4StartupNetListEntry(pGameSelList, NULL, this);
StdStrBuf strVersion; strVersion.Format("%d.%d.%d", C4XVER1, C4XVER2, C4XVER3);
StdStrBuf strVersion; strVersion.Format("%d.%d", C4XVER1, C4XVER2);
StdStrBuf strQuery; strQuery.Format("%s?version=%s&platform=%s", Config.Network.GetLeagueServerAddress(), strVersion.getData(), C4_OS);
pMasterserverClient->SetRefQuery(strQuery.getData(), C4StartupNetListEntry::NRQT_Masterserver);
}
@ -1217,7 +1217,7 @@ void C4StartupNetDlg::OnReferenceEntryAdd(C4StartupNetListEntry *pEntry)
void C4StartupNetDlg::CheckVersionUpdate()
{
#ifdef WITH_AUTOMATIC_UPDATE
StdStrBuf strVersion; strVersion.Format("%d.%d.%d", C4XVER1, C4XVER2, C4XVER3);
StdStrBuf strVersion; strVersion.Format("%d.%d", C4XVER1, C4XVER2);
StdStrBuf strQuery; strQuery.Format("%s?version=%s&platform=%s&action=version", Config.Network.UpdateServerAddress, strVersion.getData(), C4_OS);
if (pUpdateClient.Init() && pUpdateClient.SetServer(strQuery.getData()) && pUpdateClient.QueryUpdateURL())

4
src/gui/C4UpdateDlg.cpp
View File

@ -296,7 +296,7 @@ bool C4UpdateDlg::ApplyUpdate(const char *strUpdateFile, bool fDeleteUpdate, C4G
bool C4UpdateDlg::IsValidUpdate(const char *szVersion)
{
StdStrBuf strVersion; strVersion.Format("%d.%d.%d", C4XVER1, C4XVER2, C4XVER3);
StdStrBuf strVersion; strVersion.Format("%d.%d", C4XVER1, C4XVER2);
if (szVersion == NULL || strlen(szVersion) == 0) return false;
return strcmp(szVersion,strVersion.getData()) != 0;
}
@ -319,7 +319,7 @@ bool C4UpdateDlg::CheckForUpdates(C4GUI::Screen *pScreen, bool fAutomatic)
C4Network2UpdateClient UpdateClient;
bool fSuccess = false, fAborted = false;
StdStrBuf strVersion; strVersion.Format("%d.%d.%d", C4XVER1, C4XVER2, C4XVER3);
StdStrBuf strVersion; strVersion.Format("%d.%d", C4XVER1, C4XVER2);
StdStrBuf strQuery; strQuery.Format("%s?version=%s&platform=%s&action=version", Config.Network.UpdateServerAddress, strVersion.getData(), C4_OS);
if (UpdateClient.Init() && UpdateClient.SetServer(strQuery.getData()) && UpdateClient.QueryUpdateURL())
{

2
src/landscape/C4Scenario.cpp
View File

@ -142,7 +142,7 @@ void C4SHead::Default()
Origin.Clear();
Icon=18;
*Title = *Loader = *Font = *Engine = *MissionAccess = '\0';
C4XVer[0] = C4XVer[1] = C4XVer[2] = 0;
C4XVer[0] = C4XVer[1] = 0;
Difficulty = StartupPlayerCount = RandomSeed = 0;
SaveGame = Replay = NoInitialize = false;
Film = 0;

2
src/landscape/C4Scenario.h
View File

@ -61,7 +61,7 @@ enum C4SFilmMode
class C4SHead
{
public:
int32_t C4XVer[3];
int32_t C4XVer[2];
char Title[C4MaxTitle+1];
char Loader[C4MaxTitle+1];
char Font[C4MaxTitle+1]; // scenario specific font; may be 0

4
src/network/C4Network2.cpp
View File

@ -1064,9 +1064,9 @@ void C4Network2::HandleConn(const C4PacketConn &Pkt, C4Network2IOConnection *pCo
// check engine version
bool fWrongPassword = false;
if (Pkt.getVer() != C4XVER1*10000 + C4XVER2*100 + C4XVER3)
if (Pkt.getVer() != C4XVER1*100 + C4XVER2)
{
reply.Format("wrong engine (%d.%d.%d, I have %d.%d.%d)", Pkt.getVer()/10000, Pkt.getVer()/100%100, Pkt.getVer()%100, C4XVER1, C4XVER2, C4XVER3);
reply.Format("wrong engine (%d.%d, I have %d.%d)", Pkt.getVer()/100, Pkt.getVer()%100, C4XVER1, C4XVER2);
fOK = false;
}
else

4
src/network/C4Packet2.cpp
View File

@ -408,12 +408,12 @@ void C4PacketList::CompileFunc(StdCompiler *pComp)
// *** C4PacketConn
C4PacketConn::C4PacketConn()
: iVer(C4XVER1*10000 + C4XVER2*100 + C4XVER3)
: iVer(C4XVER1*100 + C4XVER2)
{
}
C4PacketConn::C4PacketConn(const C4ClientCore &nCCore, uint32_t inConnID, const char *szPassword)
: iVer(C4XVER1*10000 + C4XVER2*100 + C4XVER3),
: iVer(C4XVER1*100 + C4XVER2),
iConnID(inConnID),
CCore(nCCore),
Password(szPassword)

4
src/object/C4Def.cpp
View File

@ -62,7 +62,7 @@ private:
void C4Def::DefaultDefCore()
{
rC4XVer[0]=rC4XVer[1]=rC4XVer[2]=0;
rC4XVer[0]=rC4XVer[1]=0;
RequireDef.Clear();
Shape.Default();
Entrance.Default();
@ -126,7 +126,7 @@ bool C4Def::LoadDefCore(C4Group &hGroup)
Source.Clear();
// Let's be bold: Rewrite, with current version
/*rC4XVer[0] = C4XVER1; rC4XVer[1] = C4XVER2; rC4XVer[2] = C4XVER3;
/*rC4XVer[0] = C4XVER1; rC4XVer[1] = C4XVER2;
hGroup.Rename(C4CFN_DefCore, C4CFN_DefCore ".old");
Save(hGroup);*/

2
src/object/C4Def.h
View File

@ -101,7 +101,7 @@ class C4Def: public C4PropListStatic
{
public:
C4ID id;
int32_t rC4XVer[3];
int32_t rC4XVer[2];
C4IDList RequireDef;
C4Shape Shape;
C4Rect Entrance;

4
src/object/C4DefList.cpp
View File

@ -287,14 +287,14 @@ int32_t C4DefList::RemoveTemporary()
return removed;
}
int32_t C4DefList::CheckEngineVersion(int32_t ver1, int32_t ver2, int32_t ver3)
int32_t C4DefList::CheckEngineVersion(int32_t ver1, int32_t ver2)
{
int32_t rcount=0;
C4Def *cdef,*prev,*next;
for (cdef=FirstDef,prev=NULL; cdef; cdef=next)
{
next=cdef->Next;
if (CompareVersion(cdef->rC4XVer[0],cdef->rC4XVer[1],cdef->rC4XVer[2],ver1,ver2,ver3) > 0)
if (CompareVersion(cdef->rC4XVer[0],cdef->rC4XVer[1],ver1,ver2) > 0)
{
if (prev) prev->Next=cdef->Next;
else FirstDef=cdef->Next;

2
src/object/C4DefList.h
View File

@ -52,7 +52,7 @@ public:
int32_t GetDefCount();
int32_t GetIndex(C4ID id);
int32_t RemoveTemporary();
int32_t CheckEngineVersion(int32_t ver1, int32_t ver2, int32_t ver3);
int32_t CheckEngineVersion(int32_t ver1, int32_t ver2);
int32_t CheckRequireDef();
void Draw(C4ID id, C4Facet &cgo, bool fSelected, int32_t iColor);
void Remove(C4Def *def);

2
src/res/Info.plist
View File

@ -185,6 +185,6 @@
<key>CFBundleShortVersionString</key>
<string>${C4VERSION}</string>
<key>CFBundleVersion</key>
<string>${C4XVER1}.${C4XVER2}.${C4XVER3}</string>
<string>${C4XVER1}.${C4XVER2}</string>
</dict>
</plist>

4
src/res/engine.rc
View File

@ -53,8 +53,8 @@ __GDF_XML DATA "WindowsGamesExplorer.xml"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION C4XVER1,C4XVER2,C4XVER3,0
PRODUCTVERSION C4XVER1,C4XVER2,C4XVER3,0
FILEVERSION C4XVER1,C4XVER2,0
PRODUCTVERSION C4XVER1,C4XVER2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L

1
src/script/C4Script.cpp
View File

@ -746,7 +746,6 @@ C4ScriptConstDef C4ScriptConstMap[]=
{ "C4X_Ver1", C4V_Int, C4XVER1},
{ "C4X_Ver2", C4V_Int, C4XVER2},
{ "C4X_Ver3", C4V_Int, C4XVER3},
{ NULL, C4V_Nil, 0}
};