Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing build year.number #318

Merged
merged 1 commit into from Dec 22, 2021
Merged

Fixing build year.number #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -2,6 +2,22 @@

project("Solar2D")

# Set version

if (DEFINED ENV{BUILD_NUMBER})
set(BUILD_NUMBER $ENV{BUILD_NUMBER})
else()
set(BUILD_NUMBER 9999)
endif()
if (DEFINED ENV{YEAR})
set(YEAR $ENV{YEAR})
else()
set(YEAR 2100)
endif()

message("YEAR: " ${YEAR})
message("BUILD_NUMBER: " ${BUILD_NUMBER})

# Set a default build type if none was specified

set(default_build_type "Release")
Expand Down
10 changes: 8 additions & 2 deletions librtt/Core/Rtt_Version.h
View file
Open in desktop
Expand Up @@ -20,10 +20,16 @@

#define Rtt_LOCAL_BUILD_REVISION 9999

#define Rtt_BUILD_YEAR 2100
#ifndef Rtt_BUILD_YEAR
# define Rtt_BUILD_YEAR 2100
#endif

#define Rtt_BUILD_MONTH 1
#define Rtt_BUILD_DAY 1
#define Rtt_BUILD_REVISION Rtt_LOCAL_BUILD_REVISION

#ifndef Rtt_BUILD_REVISION
# define Rtt_BUILD_REVISION Rtt_LOCAL_BUILD_REVISION
#endif

// If this is a public release, this should be 0
#define Rtt_IS_DAILYBUILD 1
Expand Down
4 changes: 4 additions & 0 deletions platform/linux/CMakeList.txt
View file
Open in desktop
Expand Up @@ -1022,6 +1022,7 @@ FOREACH(LUA_FILE ${LUA_REMDEBUG_SOURCES})
ENDFOREACH()

target_compile_definitions( Solar2D PUBLIC
Rtt_BUILD_REVISION=${BUILD_NUMBER} Rtt_BUILD_YEAR=${YEAR}
LUA_USE_POPEN Rtt_LUA_COMPILER LUA_DL_DLOPEN wxUSE_MEDIACTRL=1 wxUSE_WEBVIEW=1
__WXGTK__ HAVE_SSIZE_T wxUSE_XTEST wxHAS_INOTIFY wxUSE_SELECT_DISPATCHER WXWIN_COMPATIBILITY_3_0
wxUSE_PRIVATE_FONTS wxUSE_ACTIVITYINDICATOR wxUSE_ADDREMOVECTRL wxUSE_UNSAFE_WXSTRING_CONV
Expand All @@ -1031,6 +1032,7 @@ target_compile_definitions( Solar2D PUBLIC
)

target_compile_definitions( Solar2DSimulator PUBLIC
Rtt_BUILD_REVISION=${BUILD_NUMBER} Rtt_BUILD_YEAR=${YEAR}
LUA_USE_POPEN Rtt_AUTHORING_SIMULATOR Rtt_LUA_COMPILER Rtt_SIMULATOR LUA_DL_DLOPEN wxUSE_MEDIACTRL=1 wxUSE_WEBVIEW=1
__WXGTK__ HAVE_SSIZE_T wxUSE_XTEST wxHAS_INOTIFY wxUSE_SELECT_DISPATCHER WXWIN_COMPATIBILITY_3_0
wxUSE_PRIVATE_FONTS wxUSE_ACTIVITYINDICATOR wxUSE_ADDREMOVECTRL wxUSE_UNSAFE_WXSTRING_CONV
Expand All @@ -1040,6 +1042,7 @@ target_compile_definitions( Solar2DSimulator PUBLIC
)

target_compile_definitions( Solar2DBuilder PUBLIC
Rtt_BUILD_REVISION=${BUILD_NUMBER} Rtt_BUILD_YEAR=${YEAR}
LUA_USE_POPEN Rtt_LUA_COMPILER Rtt_SIMULATOR CORONABUILDER_LINUX LUA_DL_DLOPEN wxUSE_MEDIACTRL=1 wxUSE_WEBVIEW=1
__WXGTK__ HAVE_SSIZE_T wxUSE_XTEST wxHAS_INOTIFY wxUSE_SELECT_DISPATCHER WXWIN_COMPATIBILITY_3_0
wxUSE_PRIVATE_FONTS wxUSE_ACTIVITYINDICATOR wxUSE_ADDREMOVECTRL wxUSE_UNSAFE_WXSTRING_CONV
Expand All @@ -1049,6 +1052,7 @@ target_compile_definitions( Solar2DBuilder PUBLIC
)

target_compile_definitions( Solar2DConsole PUBLIC
Rtt_BUILD_REVISION=${BUILD_NUMBER} Rtt_BUILD_YEAR=${YEAR}
wxUSE_MEDIACTRL=1 wxUSE_WEBVIEW=1 __WXGTK__ HAVE_SSIZE_T wxUSE_XTEST wxHAS_INOTIFY wxUSE_SELECT_DISPATCHER WXWIN_COMPATIBILITY_3_0
wxUSE_PRIVATE_FONTS wxUSE_ACTIVITYINDICATOR wxUSE_ADDREMOVECTRL wxUSE_UNSAFE_WXSTRING_CONV wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_GLCANVAS
)
Expand Down
3 changes: 1 addition & 2 deletions platform/linux/src/Rtt_LinuxMenuEvents.cpp
View file
Open in desktop
Expand Up @@ -256,8 +256,7 @@ void LinuxMenuEvents::OnAbout(wxCommandEvent &WXUNUSED(event))
{
wxAboutDialogInfo info;
string version("Version: ");
version.append(to_string(Rtt_BUILD_YEAR)).append(".").append(to_string(Rtt_LOCAL_BUILD_REVISION));
info.SetName("Solar2D Simulator");
version.append(Rtt_STRING_BUILD); info.SetName("Solar2D Simulator");
info.SetVersion(version);
info.SetCopyright(Rtt_STRING_COPYRIGHT);
info.AddDeveloper("Danny Glover, Robert Craig. Based on initial port by the CoronaLabs team.");
Expand Down