OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

remove pointless "BUILD_TYPE" option... external vs. internal client should really be enough

Browse Source 
(this also removes some hard-coded Cyan URLs which depended on that option)
This commit is contained in:
diafero
2011-07-31 13:35:38 +02:00
parent f9e6f873b6
commit 9c28eca30f
21 changed files with 33 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h
View File

@ -36,7 +36,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtils/pnUtils.h"
#include "pnPrBuildId.h"
#include "pnPrBuildType.h"
#include "pnPrBranchId.h"
#include "pnPrProductId.h"
#include "pnPrBuildString.h"

9
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.h
View File

@ -43,3 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
unsigned BuildId ();
void OverrideBuildId (unsigned buildId);
/*****************************************************************************
*
* BuildType definition
*
***/
#define BUILD_TYPE_LIVE 50

83
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildType.cpp
View File

@ -1,83 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
/*****************************************************************************
*
* $/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildType.cpp
*
***/
#include "../Pch.h"
#pragma hdrstop
/*****************************************************************************
*
* Exports
*
***/
//============================================================================
unsigned BuildType () {
return BUILD_TYPE;
}
//============================================================================
const wchar * BuildTypeString () {
#if BUILD_TYPE == BUILD_TYPE_DEV
return L"Dev";
#elif BUILD_TYPE == BUILD_TYPE_QA
return L"QA";
#elif BUILD_TYPE == BUILD_TYPE_TEST
return L"Test";
#elif BUILD_TYPE == BUILD_TYPE_BETA
return L"Beta";
#elif BUILD_TYPE == BUILD_TYPE_LIVE
return L"Live";
#else
# error "Unknown build type"
#endif
}
//============================================================================
const wchar *BuildTypeServerStatusPath () {
#if BUILD_TYPE == BUILD_TYPE_DEV
return nil;
#elif BUILD_TYPE == BUILD_TYPE_QA
return nil;
#elif BUILD_TYPE == BUILD_TYPE_TEST
return nil;
#elif BUILD_TYPE == BUILD_TYPE_BETA
return L"/serverstatus/moulbeta.php";
#elif BUILD_TYPE == BUILD_TYPE_LIVE
return L"/serverstatus/moullive.php";
#else
# error "Unknown build type"
#endif
}

62
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildType.h
View File

@ -1,62 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
/*****************************************************************************
*
* $/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildType.h
*
***/
#ifdef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PRIVATE_PNPRBUILDTYPE_H
#error "Header $/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildType.h included more than once"
#endif
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PRIVATE_PNPRBUILDTYPE_H
/*****************************************************************************
*
* BuildType definitions
*
***/
#ifndef BUILD_TYPE
#define BUILD_TYPE BUILD_TYPE_DEV
#endif
#define BUILD_TYPE_DEV 10
#define BUILD_TYPE_QA 20
#define BUILD_TYPE_TEST 30
#define BUILD_TYPE_BETA 40
#define BUILD_TYPE_LIVE 50
/*****************************************************************************
*
* BuildType functions
*
***/
unsigned BuildType ();
const wchar * BuildTypeString ();
const wchar * BuildTypeServerStatusPath ();

5
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp
View File

@ -102,13 +102,12 @@ const wchar * ProductLongName () {
//============================================================================
void ProductString (wchar * dest, unsigned destChars) {
// Example: "UruLive.Beta.2.214 - External.Release"
// Example: "UruLive.2.214 - External.Release"
StrPrintf(
dest,
destChars,
L"%s.%s.%u.%u - %s.%s",
L"%s.%u.%u - %s.%s",
ProductCoreName(),
BuildTypeString(),
BranchId(),
BuildId(),
#ifdef PLASMA_EXTERNAL_RELEASE

4
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.h
View File

@ -73,6 +73,6 @@ const wchar * ProductShortName (); // e.g: L"Uru" (filenam
const wchar * ProductLongName (); // e.g: L"Uru: Ages Beyond Myst" (human friendly)
// Returns: "<ProductCoreName>.<BuildTypeString>.<BranchId>.<BuildId>"
// Example: "Uru.Beta.3.204"
// Returns: "<ProductCoreName>.<BranchId>.<BuildId> - <External|Internal>.<Debug|Release>"
// Example: "Uru.3.204 - External.Release"
void ProductString (wchar * dest, unsigned destChars);