3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated handling of the SLIC3R_BUILD_ID key

Browse Source
This commit is contained in:
bubnikv 2019-05-13 18:01:00 +02:00
parent f47839e824
commit 0787fa861a
7 changed files with 6 additions and 7638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7631
resources/localization/Slic3rPE.pot
View File

File diff suppressed because it is too large Load Diff

2
src/PrusaSlicer.cpp
View File

@ -568,7 +568,7 @@ bool CLI::setup(int argc, char **argv)
void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const
{ {
boost::nowide::cout boost::nowide::cout
<< SLIC3R_APP_NAME << " " << SLIC3R_BUILD << " " << "based on Slic3r" << SLIC3R_BUILD_ID << " " << "based on Slic3r"
#ifdef SLIC3R_GUI #ifdef SLIC3R_GUI
<< " (with GUI support)" << " (with GUI support)"
#else /* SLIC3R_GUI */ #else /* SLIC3R_GUI */

2
src/libslic3r/libslic3r_version.h.in
View File

@ -4,6 +4,6 @@
#define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@" #define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@"
#define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@" #define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@"
#define SLIC3R_VERSION "@SLIC3R_VERSION@" #define SLIC3R_VERSION "@SLIC3R_VERSION@"
#define SLIC3R_BUILD "@SLIC3R_BUILD@" #define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
#endif /* __SLIC3R_VERSION_H */ #endif /* __SLIC3R_VERSION_H */

2
src/slic3r/GUI/MainFrame.cpp
View File

@ -33,7 +33,7 @@ namespace Slic3r {
namespace GUI { namespace GUI {
MainFrame::MainFrame() : MainFrame::MainFrame() :
DPIFrame(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " " + wxString(SLIC3R_BUILD) + " " + _(L("based on Slic3r")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, "mainframe"), DPIFrame(NULL, wxID_ANY, wxString(SLIC3R_BUILD_ID) + " " + _(L("based on Slic3r")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, "mainframe"),
m_printhost_queue_dlg(new PrintHostQueueDialog(this)) m_printhost_queue_dlg(new PrintHostQueueDialog(this))
{ {
// Fonts were created by the DPIFrame constructor for the monitor, on which the window opened. // Fonts were created by the DPIFrame constructor for the monitor, on which the window opened.

2
src/slic3r/GUI/SysInfoDialog.cpp
View File

@ -24,7 +24,7 @@ std::string get_main_info(bool format_as_html)
if (!format_as_html) if (!format_as_html)
out << b_start << SLIC3R_APP_NAME << b_end << line_end; out << b_start << SLIC3R_APP_NAME << b_end << line_end;
out << b_start << "Version: " << b_end << SLIC3R_VERSION << line_end; out << b_start << "Version: " << b_end << SLIC3R_VERSION << line_end;
out << b_start << "Build: " << b_end << SLIC3R_BUILD << line_end; out << b_start << "Build: " << b_end << SLIC3R_BUILD_ID << line_end;
out << line_end; out << line_end;
out << b_start << "Operating System: " << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end; out << b_start << "Operating System: " << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end;
out << b_start << "System Architecture: " << b_end << wxPlatformInfo::Get().GetArchName() << line_end; out << b_start << "System Architecture: " << b_end << wxPlatformInfo::Get().GetArchName() << line_end;

3
version.inc
View File

@ -4,7 +4,6 @@
set(SLIC3R_APP_NAME "PrusaSlicer") set(SLIC3R_APP_NAME "PrusaSlicer")
set(SLIC3R_APP_KEY "PrusaSlicer") set(SLIC3R_APP_KEY "PrusaSlicer")
set(SLIC3R_VERSION "1.42.0-beta2") set(SLIC3R_VERSION "1.42.0-beta2")
set(SLIC3R_BUILD "${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
set(SLIC3R_BUILD_ID "${SLIC3R_BUILD_ID}")
set(SLIC3R_RC_VERSION "1,42,0,0") set(SLIC3R_RC_VERSION "1,42,0,0")
set(SLIC3R_RC_VERSION_DOTS "1.42.0.0") set(SLIC3R_RC_VERSION_DOTS "1.42.0.0")

2
xs/xsp/XS.xsp
View File

@ -20,7 +20,7 @@ VERSION()
SV* SV*
BUILD() BUILD()
CODE: CODE:
RETVAL = newSVpv(SLIC3R_BUILD, 0); RETVAL = newSVpv(SLIC3R_BUILD_ID, 0);
OUTPUT: RETVAL OUTPUT: RETVAL
SV* SV*