diff --git a/OMCompiler/Makefile.omdev.mingw b/OMCompiler/Makefile.omdev.mingw index 571d3a8a86b..c33eed00c81 100644 --- a/OMCompiler/Makefile.omdev.mingw +++ b/OMCompiler/Makefile.omdev.mingw @@ -166,12 +166,12 @@ ifeq ($(CONFIG_REVISION),) else # revision is not empty, update it if it changed @if test -f revision.h; \ then \ - echo "#define CONFIG_REVISION \"$(CONFIG_REVISION) $(PLATFORM_ARCH)\"" > revision.h.tmp; diff revision.h revision.h.tmp > /dev/null; \ + echo "#define CONFIG_REVISION \"OpenModelica $(CONFIG_REVISION) $(PLATFORM_ARCH)\"" > revision.h.tmp; diff revision.h revision.h.tmp > /dev/null; \ if [ $$? -eq 0 ]; then echo No change in revision; rm revision.h.tmp; \ else echo Revision has changed. updating revision.h; \mv revision.h.tmp revision.h; touch Compiler/runtime/omc_config.h; \ fi; \ else \ - echo "#define CONFIG_REVISION \"$(CONFIG_REVISION) $(PLATFORM_ARCH)\"" > revision.h; echo Retrieved revision number. revision.h was created; \ + echo "#define CONFIG_REVISION \"OpenModelica $(CONFIG_REVISION) $(PLATFORM_ARCH)\"" > revision.h; echo Retrieved revision number. revision.h was created; \ fi; endif diff --git a/OMCompiler/SimulationRuntime/c/dataReconciliation/dataReconciliation.cpp b/OMCompiler/SimulationRuntime/c/dataReconciliation/dataReconciliation.cpp index 24df3f2ecb0..e30745892ed 100644 --- a/OMCompiler/SimulationRuntime/c/dataReconciliation/dataReconciliation.cpp +++ b/OMCompiler/SimulationRuntime/c/dataReconciliation/dataReconciliation.cpp @@ -1247,7 +1247,7 @@ int RunReconciliation(DATA* data, threadData_t *threadData, inputData x, matrixD myfile << " \n" << " ModelName: \n" << "" << data->modelData->modelName << " \n"; myfile << " \n" << " ModelDirectory: \n" << "" << data->modelData->modelDir << " \n"; myfile << " \n" << " Measurement Files: \n" << "" << omc_flagValue[FLAG_DATA_RECONCILE_Sx] << " \n"; - myfile << " \n" << " Generated: \n" << "" << ctime(&now) << " by OpenModelica-"<< "" << CONFIG_VERSION << "" << " \n"; + myfile << " \n" << " Generated: \n" << "" << ctime(&now) << " by "<< "" << CONFIG_VERSION << "" << " \n"; myfile << "\n"; /* Add Analysis data */ diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp b/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp index 892e68993b0..fedbb47d756 100644 --- a/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp +++ b/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp @@ -67,7 +67,7 @@ CrashReportDialog::CrashReportDialog(QString stacktrace) // bug description label and textbox mpBugDescriptionLabel = new Label(tr("Describe in a few words what you were doing when the error occurred:")); mpBugDescriptionTextBox = new QPlainTextEdit( - QString("%1 connected to %2%5.\nThe running OS is %3 on %4.\n").arg(GIT_SHA,Helper::OpenModelicaVersion, + QString("Connected to %1%4.\nThe running OS is %2 on %3.\n").arg(Helper::OpenModelicaVersion, #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture(), #elif defined(__APPLE__) diff --git a/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp index be2828060e8..2af5c267a98 100644 --- a/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp +++ b/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp @@ -4392,9 +4392,8 @@ AboutOMEditDialog::AboutOMEditDialog(MainWindow *pMainWindow) const QString aboutText = tr( "

%1 - %2

" - "%3
" - "Connected to %4
" - "Connected to %5

" + "Connected to %3
" + "Connected to %4

" "Copyright Open Source Modelica Consortium (OSMC).
" "Distributed under OSMC-PL and GPL, see www.openmodelica.org.

" "Initially developed by Adeel Asghar and Sonia Tariq as part of their final master thesis." @@ -4423,7 +4422,6 @@ AboutOMEditDialog::AboutOMEditDialog(MainWindow *pMainWindow) "") .arg(Helper::applicationName, Helper::applicationIntroText, - GIT_SHA, Helper::OpenModelicaVersion, oms_getVersion()); // about text label diff --git a/OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw b/OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw index 3b9cf0be71b..545c967c1f2 100644 --- a/OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw +++ b/OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw @@ -9,7 +9,6 @@ builddir_share=$(OMBUILDDIR)/share/ resourcedir=./Resources/nls/ SHREXT=.dll CONFIG_DEFAULT_OPENMODELICAHOME = "$(OMBUILDDIR)/" -GIT_SHA = $(shell git describe --match "v*.*" --always) LSB_RELEASE = $(shell cmd /c "ver") ifeq (MINGW32,$(findstring MINGW32,$(shell uname))) @@ -50,22 +49,11 @@ MakefileClean: OMEditGUI.pro $(QMAKE) "CONFIG+=release" omc_config.h: - @echo Current version: "$(GIT_SHA) $(PLATFORM_ARCH)" @echo Current omhome: "$(CONFIG_DEFAULT_OPENMODELICAHOME)" @echo Current lsb_release: "$(LSB_RELEASE)" -ifeq ($(GIT_SHA),) - @if test -f omc_config.h; \ - then echo Could not retrieve version number. omc_config.h not updated; \ - else \ - echo "#define CONFIG_DEFAULT_OPENMODELICAHOME \"$(CONFIG_DEFAULT_OPENMODELICAHOME)\"" > omc_config.h; \ - echo "#define GIT_SHA \"OMEdit unknown $(PLATFORM_ARCH)\""; >> omc_config.h; \ - echo "#define LSB_RELEASE \"$(LSB_RELEASE)\"" >> omc_config.h; \ - fi; -else # version is not empty, update it if it changed @if test -f omc_config.h; \ then \ echo "#define CONFIG_DEFAULT_OPENMODELICAHOME \"$(CONFIG_DEFAULT_OPENMODELICAHOME)\"" > omc_config.h.tmp; \ - echo "#define GIT_SHA \"OMEdit $(GIT_SHA) $(PLATFORM_ARCH)\"" >> omc_config.h.tmp; \ echo "#define LSB_RELEASE \"$(LSB_RELEASE)\"" >> omc_config.h.tmp; \ diff omc_config.h omc_config.h.tmp > /dev/null; \ if [ $$? -eq 0 ]; then echo No change in version; rm omc_config.h.tmp; \ @@ -73,8 +61,5 @@ else # version is not empty, update it if it changed fi; \ else \ echo "#define CONFIG_DEFAULT_OPENMODELICAHOME \"$(CONFIG_DEFAULT_OPENMODELICAHOME)\"" > omc_config.h; \ - echo "#define GIT_SHA \"OMEdit $(GIT_SHA) $(PLATFORM_ARCH)\"" >> omc_config.h; \ echo "#define LSB_RELEASE \"$(LSB_RELEASE)\"" >> omc_config.h; \ fi; -endif - diff --git a/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp index 14474a23b91..059e20c3027 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp +++ b/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp @@ -213,9 +213,6 @@ bool OMCProxy::initializeOMC(threadData_t *threadData) mHasInitialized = true; // get OpenModelica version Helper::OpenModelicaVersion = getVersion(); -#ifdef WIN32 - sendCommand("\"" + QString(GIT_SHA) + "\""); -#endif // set OpenModelicaHome variable Helper::OpenModelicaHome = mpOMCInterface->getInstallationDirectoryPath(); #ifdef WIN32 diff --git a/OMEdit/OMEdit/OMEditGUI/omc_config.h.in b/OMEdit/OMEdit/OMEditGUI/omc_config.h.in index da6bae130c7..41577bcb2c8 100644 --- a/OMEdit/OMEdit/OMEditGUI/omc_config.h.in +++ b/OMEdit/OMEdit/OMEditGUI/omc_config.h.in @@ -1,3 +1,2 @@ #define CONFIG_DEFAULT_OPENMODELICAHOME "@OPENMODELICAHOME@" -#define GIT_SHA "@SOURCE_REVISION@" @LSB_RELEASE@