From 3c8087f787edb49a8b974c81c6c713834d77fbfb Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Mon, 24 Aug 2026 11:14:57 +0200 Subject: [PATCH 1/2] Remove Autoconf Makefile build --- .gitignore | 24 - Makefile.in | 55 --- OMOptim/build/Makefile.unix.in | 35 -- OMOptim/build/OMOptim.config.in | 31 -- OMOptim/build/OMOptim.pro | 183 ------- OMOptim/build/OMOptim.windowsconfig.in | 81 ---- OMOptim/build/OMOptimLib.pro | 453 ------------------ OMOptim/buildOMOptim.pro | 73 --- OMOptimBasis/build/Makefile.unix.in | 28 -- OMOptimBasis/build/OMOptimBasis.config.in | 8 - OMOptimBasis/build/OMOptimBasis.pro | 269 ----------- .../build/OMOptimBasis.windowsconfig.in | 45 -- configure.ac | 69 --- 13 files changed, 1354 deletions(-) delete mode 100644 Makefile.in delete mode 100644 OMOptim/build/Makefile.unix.in delete mode 100644 OMOptim/build/OMOptim.config.in delete mode 100644 OMOptim/build/OMOptim.pro delete mode 100644 OMOptim/build/OMOptim.windowsconfig.in delete mode 100644 OMOptim/build/OMOptimLib.pro delete mode 100644 OMOptim/buildOMOptim.pro delete mode 100644 OMOptimBasis/build/Makefile.unix.in delete mode 100644 OMOptimBasis/build/OMOptimBasis.config.in delete mode 100644 OMOptimBasis/build/OMOptimBasis.pro delete mode 100644 OMOptimBasis/build/OMOptimBasis.windowsconfig.in delete mode 100644 configure.ac diff --git a/.gitignore b/.gitignore index 362284d3..d4adaa18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,6 @@ -/Makefile -Makefile.unix -OMOptim/buildOMOptim.pro.* OMOptim*/bin/ -OMOptim*/build/release/ -OMOptim*/build/debug/ OMOptim/omc_config.h OMOptim/Core/OMC/omc_communication.cpp OMOptim/Core/OMC/omc_communication.h OMOptim/Core/OMC/omc_config.h -OMOptim/build/MakefileLib -OMOptim/build/omc_communication.cc -OMOptim/build/omc_communication.cpp -OMOptim/build/omc_communication.h -OMOptim*/build/Makefile -OMOptim*/build/Makefile.Debug -OMOptim*/build/Makefile.Release -OMOptim*/build/MakefileLib.Debug -OMOptim*/build/MakefileLib.Release -OMOptim*/build/object_script.* ParadisEO-2.0.1/build/ -autom4te.cache/ -config.guess -config.sub -config.log -config.status -configure -*.config -install-sh -qmake.sh diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index e2ae26c8..00000000 --- a/Makefile.in +++ /dev/null @@ -1,55 +0,0 @@ -all: omoptim - -.PHONY: omoptim omoptimbasis paradiseo - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ - -ifeq (@APP@,) -install: - mkdir -p ${DESTDIR}/@bindir@ - cp -a OMOptim/bin/OMOptim@EXE@ ${DESTDIR}/@bindir@ -else -install: - mkdir -p ${DESTDIR}/Applications/ - cp -a OMOptim/bin/OMOptim@APP@ ${DESTDIR}/Applications/ -endif - -mkbuilddirs: -ifeq (@APP@,) - mkdir -p @OMBUILDDIR@/@bindir@ -else - mkdir -p @OMBUILDDIR@/Applications -endif - -PARADISEO=ParadisEO-2.0.1/build - -$(PARADISEO)/Makefile: Makefile - mkdir -p $(PARADISEO) - (cd $(PARADISEO) && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" cmake ..) - -paradiseo: $(PARADISEO)/Makefile - $(MAKE) -C $(PARADISEO) VERBOSE=1 -omoptim: omoptimbasis paradiseo mkbuilddirs - $(MAKE) -C OMOptim/build -f Makefile.unix -ifeq (@APP@,) - cp -a OMOptim/bin/OMOptim@EXE@ @OMBUILDDIR@/bin -else - cp -a OMOptim/bin/OMOptim@APP@ @OMBUILDDIR@/Applications/ -endif - -omoptimbasis: - $(MAKE) -C OMOptimBasis/build -f Makefile.unix -clean: - $(MAKE) -C OMOptimBasis/build -f Makefile.unix clean - $(MAKE) -C OMOptim/build -f Makefile.unix clean - test ! -d $(PARADISEO) || rm -r $(PARADISEO) -distclean: clean - rm -f config.status configure Makefile OMOptim/build/Makefile.unix OMOptim/build/OMOptim.config OMOptimBasis/build/Makefile.unix OMOptimBasis/build/OMOptimBasis.config OMOptim/Core/OMC/omc_config.h -Makefile: Makefile.in config.status - ./config.status -config.status: configure - ./config.status -recheck -configure: configure.ac common/m4/*.m4 - autoconf diff --git a/OMOptim/build/Makefile.unix.in b/OMOptim/build/Makefile.unix.in deleted file mode 100644 index fcdc7b85..00000000 --- a/OMOptim/build/Makefile.unix.in +++ /dev/null @@ -1,35 +0,0 @@ -.PHONY: install build $(NAME) always - -top_dir=@top_builddir@ -NAME=OMOptim -LIBNAME=OMOptimLib -DEST=../bin -APP=@APP@ -EXE=@EXE@ -QMAKE=@QMAKE@ - -default: build - -always: - -$(NAME): Makefile $(NAME).config $(LIBNAME) - $(MAKE) -f Makefile - -$(LIBNAME): MakefileLib - $(MAKE) -f MakefileLib - -build: $(LIBNAME) $(NAME) - -Makefile: $(NAME).pro $(NAME).config - $(QMAKE) $< -o $@ -MakefileLib: $(LIBNAME).pro $(NAME).config - $(QMAKE) $< -o $@ -Makefile.unix: Makefile.unix.in - (cd $(top_dir) && ./config.status) -$(NAME).config: $(NAME).config.in - (cd $(top_dir) && ./config.status) - -clean: - test ! -f Makefile || $(MAKE) -f Makefile clean - test ! -f MakefileLib || $(MAKE) -f MakefileLib clean - rm -rf *.o *.a moc_* OMOptim release/ Makefile MakefileLib diff --git a/OMOptim/build/OMOptim.config.in b/OMOptim/build/OMOptim.config.in deleted file mode 100644 index 35dfa9a0..00000000 --- a/OMOptim/build/OMOptim.config.in +++ /dev/null @@ -1,31 +0,0 @@ -QMAKE_CC = @CC@ -QMAKE_CXX = @CXX@ -QMAKE_LINK = @CXX@ -OPENMODELICAHOME = @OPENMODELICAHOME@ -PARADISEO = @top_builddir@/ParadisEO-2.0.1 - -LIBS += -L$${PARADISEO}/build/eo/lib -L$${PARADISEO}/build/moeo/lib -lmoeo -leo -leoutils -L@top_builddir@/OMOptimBasis/bin -lOMOptimBasis -L@OPENMODELICAHOME@/lib/@host_short@/omc -lomqwt -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lomcgc @RPATH_QMAKE@ -INCLUDEPATH += $${OPENMODELICAHOME}/include/omplot/qwt $${OPENMODELICAHOME}/include/omc/c/ $${PARADISEO}/eo/src $${PARADISEO}/eo/src/utils $${PARADISEO}/mo/src $${PARADISEO}/moeo/src - -### FOLDERS, INCLUDES - -CONFIG(debug, debug|release){ - UI_DIR = debug/generatedfiles/ui - MOC_DIR = debug/generatedfiles/moc - RCC_DIR = debug/generatedfiles/rcc - OBJECTS_DIR = debug/generatedfiles - - INCLUDEPATH += ../../OMOptimBasis/build/debug/generatedfiles/ui - INCLUDEPATH += debug/generatedfiles/ui - -}else { - UI_DIR = release/generatedfiles/ui - MOC_DIR = release/generatedfiles/moc - RCC_DIR = release/generatedfiles/rcc - OBJECTS_DIR = release/generatedfiles - - INCLUDEPATH += ../../OMOptimBasis/build/release/generatedfiles/ui - INCLUDEPATH += release/generatedfiles/ui -} - -QMAKE_LFLAGS += @LDFLAGS@ diff --git a/OMOptim/build/OMOptim.pro b/OMOptim/build/OMOptim.pro deleted file mode 100644 index c318edf1..00000000 --- a/OMOptim/build/OMOptim.pro +++ /dev/null @@ -1,183 +0,0 @@ -# This file is part of OpenModelica. -# -# Copyright (c) 1998-2026, Open Source Modelica Consortium (OSMC), -# c/o Linköpings universitet, Department of Computer and Information Science, -# SE-58183 Linköping, Sweden. -# -# All rights reserved. -# -# THIS PROGRAM IS PROVIDED UNDER THE TERMS OF AGPL VERSION 3 LICENSE OR -# THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8. -# ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES -# RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GNU AGPL -# VERSION 3, ACCORDING TO RECIPIENTS CHOICE. -# -# The OpenModelica software and the OSMC (Open Source Modelica Consortium) -# Public License (OSMC-PL) are obtained from OSMC, either from the above -# address, from the URLs: -# http://www.openmodelica.org or -# https://github.com/OpenModelica/ or -# http://www.ida.liu.se/projects/OpenModelica, -# and in the OpenModelica distribution. -# -# GNU AGPL version 3 is obtained from: -# https://www.gnu.org/licenses/licenses.html#GPL -# -# This program is distributed WITHOUT ANY WARRANTY; without -# even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH -# IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. -# -# See the full OSMC Public License conditions for more details. - -TEMPLATE = app -TARGET = OMOptim - -QT += core gui svg xml printsupport widgets -equals(QT_MAJOR_VERSION, 6) { - QT += core5compat -} - -CONFIG += warn_off - -CONFIG(debug, debug|release){ - DEFINES+=DEBUG - # ADD LINK TO OMOPTIM LIB - LIBS += -L../bin -L../../OMOptimBasis/bin -lOMOptimd - - TARGET = $$join(TARGET,,,d) -}else{ - LIBS += -L../bin -L../../OMOptimBasis/bin -lOMOptim -} - - - -win32 { - include(OMOptim.windowsconfig.in) -}else { - include(OMOptim.config) -} - -# OMOptim drives the OpenModelica compiler in-process and uses the -# MMC_TRY_TOP/threadData macros, which reference threadData->parentMutex. -# That member only exists when OM_HAVE_PTHREADS is defined (as OMEdit does), -# so define it here for all platforms. -DEFINES += OM_HAVE_PTHREADS - -CONFIG(debug, debug|release): PRE_TARGETDEPS += ../bin/libOMOptimd.a -else:CONFIG(release, debug|release): PRE_TARGETDEPS += ../bin/libOMOptim.a - - -DESTDIR = ../bin -DEPENDPATH += ../bin - -INCLUDEPATH += . \ - .. \ - ../../ \ - ../Core \ - ../GUI \ - ../Vld \ - ../Core/Dymola \ - ../Core/FileData \ - ../Core/Infos \ - ../Core/Modelica \ - ../Core/OMC \ - ../Core/OpenModelica \ - ../Core/Problems \ - ../Core/Tools \ - ../Core/Util \ - ../Core/Units \ - ../GUI/Dialogs \ - ../GUI/Plots \ - ../GUI/Resources \ - ../GUI/Scene \ - ../GUI/Tabs \ - ../GUI/Tools \ - ../GUI/Views \ - ../GUI/Widgets \ - ../Core/Optim \ - ../Core/Optim/EA \ - ../Core/Optim/MILP \ - ../Core/Problems/BlockSubs \ - ../Core/Optim/EA/Checkpoints \ - ../Core/Optim/EA/Chromosome \ - ../Core/Optim/EA/Crossover \ - ../Core/Optim/EA/Evaluations \ - ../Core/Optim/EA/Init \ - ../Core/Optim/EA/Monitor \ - ../Core/Optim/EA/Mutations \ - ../Core/Optim/EA/NSGA2 \ - ../Core/Optim/EA/Results \ - ../Core/Optim/EA/SPEA2 \ - ../Core/Optim/EA/SPEA2Adaptative \ - ../Core/Optim/EA/SA1 \ - ../../OMOptimBasis/ \ - ../../OMOptimBasis/FileData \ - ../../OMOptimBasis/GUI \ - ../../OMOptimBasis/GUI/Tools \ - ../../OMOptimBasis/GUI/Dialogs \ - ../../OMOptimBasis/GUI/Widgets \ - ../../OMOptimBasis/Infos \ - ../../OMOptimBasis/Units \ - ../../OMOptimBasis/Tools \ - ../../OMOptimBasis/Problems - -DEPENDPATH += . \ - .. \ - ../../ \ - ../Core \ - ../GUI \ - ../Vld \ - ../Core/Dymola \ - ../Core/FileData \ - ../Core/Infos \ - ../Core/Modelica \ - ../Core/OMC \ - ../Core/OpenModelica \ - ../Core/Problems \ - ../Core/Tools \ - ../Core/Units \ - ../GUI/Dialogs \ - ../GUI/Plots \ - ../GUI/Resources \ - ../GUI/Scene \ - ../GUI/Tabs \ - ../GUI/Tools \ - ../GUI/Views \ - ../GUI/Widgets \ - ../Core/Optim \ - ../Core/Optim/EA \ - ../Core/Optim/MILP \ - ../Core/Problems/BlockSubs \ - ../Core/Optim/EA/Checkpoints \ - ../Core/Optim/EA/Chromosome \ - ../Core/Optim/EA/Crossover \ - ../Core/Optim/EA/Evaluations \ - ../Core/Optim/EA/Init \ - ../Core/Optim/EA/Monitor \ - ../Core/Optim/EA/Mutations \ - ../Core/Optim/EA/NSGA2 \ - ../Core/Optim/EA/Results \ - ../Core/Optim/EA/SPEA2 \ - ../Core/Optim/EA/SPEA2Adaptative \ - ../Core/Optim/EA/SA1 \ - ../../OMOptimBasis/ \ - ../../OMOptimBasis/FileData \ - ../../OMOptimBasis/GUI \ - ../../OMOptimBasis/GUI/Tools \ - ../../OMOptimBasis/GUI/Dialogs \ - ../../OMOptimBasis/GUI/Widgets \ - ../../OMOptimBasis/Infos \ - ../../OMOptimBasis/Units \ - ../../OMOptimBasis/Tools \ - ./../OMOptimBasis/Problems - -SOURCES += ../main.cpp - - -RESOURCES += \ - ../GUI/Resources/OMOptim.qrc - -RC_FILE = ../GUI/Resources/rc_omoptim.rc - -HEADERS += diff --git a/OMOptim/build/OMOptim.windowsconfig.in b/OMOptim/build/OMOptim.windowsconfig.in deleted file mode 100644 index e24c9c98..00000000 --- a/OMOptim/build/OMOptim.windowsconfig.in +++ /dev/null @@ -1,81 +0,0 @@ -### PREPROCESSOR and FLAGS -QMAKE_LFLAGS += -Wl,--enable-auto-import -QMAKE_CXXFLAGS_WARN_OFF += -Wunused-parameter - -_cxx = $$(CXX) -equals(_cxx, clang++) { - message("Found clang++ on windows in $CXX, removing unknown flags: -fno-keep-inline-dllexport") - QMAKE_CFLAGS -= -fno-keep-inline-dllexport - QMAKE_CXXFLAGS -= -fno-keep-inline-dllexport -} - -DEFINES += __x86__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ \ - WIN32 \ - _WINDOWS \ - _USRDLL \ - _CRT_SECURE_NO_DEPRECATE \ - _WIN32_WINNT=0x0400 \ - _MBCS - -### FOLDERS, INCLUDES - -CONFIG(debug, debug|release){ - UI_DIR = debug/generatedfiles/ui - MOC_DIR = debug/generatedfiles/moc - RCC_DIR = debug/generatedfiles/rcc - OBJECTS_DIR = debug/generatedfiles - - INCLUDEPATH += ../../OMOptimBasis/build/debug/generatedfiles/ui - INCLUDEPATH += debug/generatedfiles/ui - -}else { - UI_DIR = release/generatedfiles/ui - MOC_DIR = release/generatedfiles/moc - RCC_DIR = release/generatedfiles/rcc - OBJECTS_DIR = release/generatedfiles - - INCLUDEPATH += ../../OMOptimBasis/build/release/generatedfiles/ui - INCLUDEPATH += release/generatedfiles/ui -} - - # win32 vs. win64 - UNAME = $$system(uname) - isEmpty(UNAME): UNAME = MINGW32 - ISMINGW32 = $$find(UNAME, MINGW32) - message(uname: $$UNAME) - count( ISMINGW32, 1 ) { - DEFINES += __x86__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ - } else { - DEFINES += __x86__ \ - __x86_64__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ \ - _WIN64 \ - MS_WIN64 - } - - -INCLUDEPATH += $$(OMBUILDDIR)/include/omplot/qwt \ - $$(OMBUILDDIR)/include/omc/c/ \ - ../../ParadisEO-2.0.1/eo/src \ - ../../ParadisEO-2.0.1/eo/src/utils \ - ../../ParadisEO-2.0.1/moeo/src \ - ../../ParadisEO-2.0.1/mo/src - -### LIBRARIES (order has an impact !!) -CONFIG(debug, debug|release){ - LIBS += -L$$(OMBUILDDIR)/lib/omc -lOMOptimBasisd -lomqwtd -}else { - LIBS += -L$$(OMBUILDDIR)/lib/omc -lOMOptimBasis -lomqwt -} - -LIBS += -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lomcgc \ - -L../../ParadisEO-2.0.1/build/eo/lib -leo -leoutils \ - -L../../ParadisEO-2.0.1/build/moeo/lib -lmoeo diff --git a/OMOptim/build/OMOptimLib.pro b/OMOptim/build/OMOptimLib.pro deleted file mode 100644 index edb32ca4..00000000 --- a/OMOptim/build/OMOptimLib.pro +++ /dev/null @@ -1,453 +0,0 @@ -# This file is part of OpenModelica. -# -# Copyright (c) 1998-2026, Open Source Modelica Consortium (OSMC), -# c/o Linköpings universitet, Department of Computer and Information Science, -# SE-58183 Linköping, Sweden. -# -# All rights reserved. -# -# THIS PROGRAM IS PROVIDED UNDER THE TERMS OF AGPL VERSION 3 LICENSE OR -# THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8. -# ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES -# RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GNU AGPL -# VERSION 3, ACCORDING TO RECIPIENTS CHOICE. -# -# The OpenModelica software and the OSMC (Open Source Modelica Consortium) -# Public License (OSMC-PL) are obtained from OSMC, either from the above -# address, from the URLs: -# http://www.openmodelica.org or -# https://github.com/OpenModelica/ or -# http://www.ida.liu.se/projects/OpenModelica, -# and in the OpenModelica distribution. -# -# GNU AGPL version 3 is obtained from: -# https://www.gnu.org/licenses/licenses.html#GPL -# -# This program is distributed WITHOUT ANY WARRANTY; without -# even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH -# IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. -# -# See the full OSMC Public License conditions for more details. - -TEMPLATE = lib -TARGET = OMOptim -CONFIG += staticlib warn_off - -QT += core gui svg xml printsupport widgets -equals(QT_MAJOR_VERSION, 6) { - QT += core5compat -} - -DESTDIR = ../bin -DEPENDPATH += ../bin - -INCLUDEPATH += . \ - .. \ - ../../ \ - ../Core \ - ../GUI \ - ../Vld \ - ../Core/Dymola \ - ../Core/FileData \ - ../Core/Infos \ - ../Core/Modelica \ - ../Core/OMC \ - ../Core/Problems \ - ../Core/Tools \ - ../Core/Util \ - ../Core/Units \ - ../GUI/Dialogs \ - ../GUI/Plots \ - ../GUI/Resources \ - ../GUI/Scene \ - ../GUI/Tabs \ - ../GUI/Tools \ - ../GUI/Views \ - ../GUI/Widgets \ - ../Core/Optim \ - ../Core/Optim/EA \ - ../Core/Optim/MILP \ - # ../Core/Problems/BlockSubs \ - ../Core/Optim/EA/Checkpoints \ - ../Core/Optim/EA/Chromosome \ - ../Core/Optim/EA/Crossover \ - ../Core/Optim/EA/Evaluations \ - ../Core/Optim/EA/Init \ - ../Core/Optim/EA/Monitor \ - ../Core/Optim/EA/Mutations \ - ../Core/Optim/EA/NSGA2 \ - ../Core/Optim/EA/Results \ - ../Core/Optim/EA/SPEA2 \ - ../Core/Optim/EA/SPEA2Adaptative \ - ../Core/Optim/EA/SA1 \ - ../Core/Optim/EA/PSO \ - ../../OMOptimBasis \ - ../../OMOptimBasis/FileData \ - ../../OMOptimBasis/GUI \ - ../../OMOptimBasis/GUI/Tools \ - ../../OMOptimBasis/GUI/Dialogs \ - ../../OMOptimBasis/GUI/Widgets \ - ../../OMOptimBasis/Infos \ - ../../OMOptimBasis/Units \ - ../../OMOptimBasis/Tools \ - ../../OMOptimBasis/Problems - -DEPENDPATH += . \ - .. \ - ../../ \ - ../Core \ - ../GUI \ - ../Vld \ - ../Core/Dymola \ - ../Core/FileData \ - ../Core/Infos \ - ../Core/Modelica \ - ../Core/OMC \ - ../Core/OpenModelica \ - ../Core/Problems \ - ../Core/Tools \ - ../Core/Units \ - ../GUI/Dialogs \ - ../GUI/Plots \ - ../GUI/Resources \ - ../GUI/Scene \ - ../GUI/Tabs \ - ../GUI/Tools \ - ../GUI/Views \ - ../GUI/Widgets \ - ../Core/Optim \ - ../Core/Optim/EA \ - ../Core/Optim/MILP \ - # ../Core/Problems/BlockSubs \ - ../Core/Optim/EA/Checkpoints \ - ../Core/Optim/EA/Chromosome \ - ../Core/Optim/EA/Crossover \ - ../Core/Optim/EA/Evaluations \ - ../Core/Optim/EA/Init \ - ../Core/Optim/EA/Monitor \ - ../Core/Optim/EA/Mutations \ - ../Core/Optim/EA/NSGA2 \ - ../Core/Optim/EA/Results \ - ../Core/Optim/EA/SPEA2 \ - ../Core/Optim/EA/SPEA2Adaptative \ - ../Core/Optim/EA/SA1 \ - ../Core/Optim/EA/PSO \ - ../../OMOptimBasis \ - ../../OMOptimBasis/FileData \ - ../../OMOptimBasis/GUI \ - ../../OMOptimBasis/GUI/Tools \ - ../../OMOptimBasis/GUI/Dialogs \ - ../../OMOptimBasis/GUI/Widgets \ - ../../OMOptimBasis/Infos \ - ../../OMOptimBasis/Units \ - ../../OMOptimBasis/Tools \ - ../../OMOptimBasis/Problems - -HEADERS += ../Core/OptObjective.h \ - ../Core/ParetoDominance.h \ - ../Core/Project.h \ - ../Core/VariablesManip.h \ - ../GUI/MainWindow.h \ - ../Core/Dymola/Dymola.h \ - ../Core/Dymola/ModPlusDymolaCtrl.h \ - ../Core/FileData/CSV.h \ - ../Core/FileData/LoadOMOptim.h \ - ../Core/FileData/SaveOMOptim.h \ - ../Core/Modelica/ModItem.h \ - ../Core/Modelica/ModItemsTree.h \ - ../Core/Modelica/ModComponent.h \ - ../Core/Modelica/OMOptimModelica.h \ - ../Core/Modelica/ModelicaConnection.h \ - # ../Core/Modelica/ModelicaConnections.h \ - ../Core/Modelica/ModelicaModifier.h \ - ../Core/Modelica/ModExecution.h \ - ../Core/Modelica/ModModel.h \ - ../Core/Modelica/ModModelPlus.h \ - ../Core/Modelica/ModPackage.h \ - ../Core/Modelica/ModPlusCtrl.h \ - ../Core/Modelica/ModLoader.h \ - ../Core/Modelica/ModRecord.h \ - ../Core/OMC/commandunit.h \ - ../Core/OMC/inputcelldelegate.h \ - ../Core/OMC/MOomc.h \ - ../Core/OpenModelica/ModPlusOMCtrl.h \ - ../Core/OpenModelica/OpenModelica.h \ - ../Core/Problems/OneSimResult.h \ - ../Core/Problems/OneSimulation.h \ - ../Core/Problems/Optimization.h \ - ../Core/Problems/OptimResult.h \ - ../Core/Tools/reportingHook.h \ - ../Core/Tools/vqtconvert.h \ - ../GUI/Dialogs/AboutOMOptim.h \ - # ../GUI/Dialogs/BlockSubstituteConnDlg.h \ - ../GUI/Dialogs/HelpDlg.h \ - ../GUI/Dialogs/newprojectform.h \ - ../GUI/Plots/MOOptPlot.h \ - ../GUI/Scene/arrow.h \ - # ../GUI/Scene/BlockDrawItem.h \ - # ../GUI/Scene/BlockSubsScene.h \ - ../GUI/Scene/diagramitem.h \ - ../GUI/Scene/diagramscene.h \ - ../GUI/Scene/diagramtextitem.h \ - # ../GUI/Widgets/WidgetBlocks.h \ - ../GUI/Widgets/WidgetCalculateMooPoints.h \ - ../GUI/Widgets/WidgetMooPlot.h \ - ../GUI/Widgets/WidgetOneSimVars.h \ - ../GUI/Widgets/WidgetOptParameters.h \ - ../GUI/Widgets/WidgetOptTable.h \ - ../GUI/Widgets/WidgetProgress.h \ -# ../GUI/Widgets/WidgetSelectComponents.h \ - ../GUI/Widgets/WidgetSelectModModel.h \ - ../GUI/Widgets/WidgetSelectOptVars.h \ - ../GUI/Widgets/WidgetSelPointScan.h \ - ../GUI/Widgets/WidgetTableRecVar.h \ - ../GUI/Widgets/WidgetToolBar.h \ - ../GUI/Widgets/widgetloadexemodel.h \ - ../Core/Optim/EA/AlgoParameter.h \ - ../Core/Optim/EA/EABase.h \ - ../Core/Optim/EA/OptimAlgo.h \ - ../Core/Optim/EA/OMEAEvalContinue.h \ - ../Core/Optim/EA/OMEAEvalFuncCounter.h \ - ../Core/Optim/EA/OMEAProgress.h \ - ../Core/Optim/EA/OptimAlgosList.h \ -# ../Core/Problems/BlockSubs/BlockSubstitution.h \ -# ../Core/Problems/BlockSubs/BlockSubstitutions.h \ - ../Core/Optim/EA/Checkpoints/EAStdCheckPoint.h \ - ../Core/Optim/EA/Checkpoints/EAUpdaterDispObjGUI.h \ - ../Core/Optim/EA/Chromosome/EOAdapt.h \ - ../Core/Optim/EA/Chromosome/EOStd.h \ - ../Core/Optim/EA/Crossover/SBCrossover.h \ - ../Core/Optim/EA/Evaluations/EAStdOptimizationEval.h \ - ../Core/Optim/EA/Init/EAAdaptReinitStdDev.h \ - ../Core/Optim/EA/Init/EAStdBounds.h \ - ../Core/Optim/EA/Init/EAStdInitBounded.h \ - ../Core/Optim/EA/Monitor/MyEoGnuplot.h \ - ../Core/Optim/EA/Monitor/MyEoGnuplot1DMonitor.h \ - ../Core/Optim/EA/Mutations/EAStdMutation.h \ - ../Core/Optim/EA/NSGA2/NSGA2.h \ - ../Core/Optim/EA/NSGA2/NSGA2Algo.h \ - ../Core/Optim/EA/Results/EAStdResult.h \ - ../Core/Optim/EA/SPEA2/SPEA2.h \ - ../Core/Optim/EA/SPEA2/SPEA2Algo.h \ - ../Core/Optim/EA/SPEA2/SPEA2Crossover.h \ - ../Core/Optim/EA/SPEA2Adaptative/SPEA2Adapt.h \ - ../Core/Optim/EA/SPEA2Adaptative/SPEA2AdaptInitBounded.h \ - ../Core/Optim/EA/SPEA2Adaptative/SPEA2AdaptMutation.h \ - #../Core/Optim/EA/PSO/PSO.h \ - #../Core/Optim/EA/PSO/PSOAlgo.h \ - #../Core/Optim/EA/PSO/PSOBreed.h \ - ../Core/Optim/EA/EA \ - ../Core/OMC/OMCHelper.h \ - ../Core/OMC/StringHandler.h \ - #../Core/Optim/EA/PSO/updateGbest.h \ - #../Core/Optim/EA/PSO/updatePbest.h \ - #../Core/Optim/EA/PSO/updateVelocity.h \ - ../GUI/Widgets/WidgetMooPointsList.h \ - ../GUI/Widgets/WidgetProjectInfos.h \ - ../GUI/Widgets/WidgetProblemActions.h \ - ../version.h \ - ../Core/Optim/EA/NSGA2/NSGA2Parameters.h \ - ../Core/Optim/EA/SPEA2/SPEA2Parameters.h \ - ../Core/Optim/EA/SPEA2Adaptative/SPEA2AdaptParameters.h \ - #../Core/Optim/EA/PSO/PSOParameters.h \ - ../GUI/Tabs/TabOMC.h \ - ../GUI/Tabs/TabOneSim.h \ - ../GUI/Tabs/TabOptimization.h \ - ../GUI/Tabs/TabProject.h \ - ../GUI/Tabs/TabResOneSim.h \ - ../GUI/Tabs/TabResOptimization.h \ - ../Core/Optim/EA/SA1/SA1Parameters.h \ - ../Core/Optim/EA/SA1/SA1Algo.h \ - ../Core/Optim/EA/SA1/SA1.h \ - ../Core/Optim/EA/SA1/SA1moShiftNeighbor.h \ - ../Core/Optim/EA/SA1/SA1moRndWithReplNeighborhood.h \ - ../Core/Optim/EA/SA1/SA1explorer.h \ - ../Core/Optim/EA/SA1/SA1mo.h \ - ../Core/Optim/EA/SA1/SA1moFullEvalByCopy.h \ - ../Core/Optim/EA/SA1/SA1moSolNeighborComparator.h \ - ../Core/Optim/EA/SA1/SA1FitnessAssignement.h \ - ../Core/Optim/EA/SA1/myEOArchiveUpdater.h \ - ../Core/Optim/EA/SA1/SA1moLocalSearch.h \ - ../Core/Optim/EA/SA1/SA1moNeighborhoodExplorer.h \ - ../Core/Optim/EA/SA1/SA1Archive.h \ - ../Core/OptObjectives.h \ - ../Core/Modelica/ModPlusCtrls.h \ - ../GUI/Widgets/WidgetCtrlParameters.h \ - ../Core/Problems/optimizationinterface.h \ - ../Core/Problems/onesimulationinterface.h \ - ../GUI/Widgets/WidgetResultInfos.h \ - $${OPENMODELICAHOME}/include/omc/c/util/read_matlab4.h \ - ../Core/OMC/OMCThreads.h \ - ../GUI/Tools/OMOptimGuiTools.h \ - ../GUI/Widgets/WidgetModelsList.h \ - ../Core/OMOptimSettings.h \ - ../Core/Dymola/DymolaParameters.h \ - ../Core/OpenModelica/OpenModelicaParameters.h \ - ../Core/ModExePlus.h \ - ../Core/ModelPlus.h \ - ../Core/ExeModel.h \ - ../Core/ModPlusExeCtrl.h \ - ../Core/Tools/ModPlusOMExeCtrl.h \ - ../Core/ModPlusDymolaExeCtrl.h \ - ../Core/PlugInterface.h \ - ../Core/ModPlusBlackBoxExeCtrl.h \ - ../scriptparseromoptim.h \ - ../GUI/Widgets/WidgetSelectEditVars.h \ - ../Core/Tools/StringHandler.h \ - ../Core/Tools/Helper.h \ - ../Core/OMC/ComponentInfo.h \ - ../Core/Util/Helper.h \ - ../Core/Util/StringHandler.h \ - ../Core/Util/Utilities.h - #../Core/ModPlusTherExeCtrl.h - -FORMS += ../GUI/MainWindow.ui \ - ../GUI/Dialogs/AboutOMOptim.ui \ - # ../GUI/Dialogs/BlockSubstituteConnDlg.ui \ - ../GUI/Dialogs/newprojectform.ui \ - ../GUI/Dialogs/OtherDlg.ui \ - # ../GUI/Widgets/WidgetBlocks.ui \ - ../GUI/Widgets/WidgetCalculateMooPoints.ui \ - ../GUI/Widgets/WidgetMooPlot.ui \ - ../GUI/Widgets/WidgetOptParameters.ui \ - ../GUI/Widgets/WidgetOptTable.ui \ - ../GUI/Widgets/WidgetProgress.ui \ -# ../GUI/Widgets/WidgetSelectComponents.ui \ - ../GUI/Widgets/WidgetSelectModModel.ui \ - ../GUI/Widgets/WidgetSelPointScan.ui \ - ../GUI/Widgets/WidgetTableRecVar.ui \ - ../GUI/Widgets/WidgetToolBar.ui \ - ../GUI/Widgets/WidgetMooPointsList.ui \ - ../GUI/Widgets/WidgetProjectInfos.ui \ - ../GUI/Widgets/WidgetProblemActions.ui \ - ../GUI/Tabs/TabResOptimization.ui \ - ../GUI/Tabs/TabProject.ui \ - ../GUI/Tabs/TabOptimization.ui \ - ../GUI/Tabs/TabOMC.ui \ - ../GUI/Widgets/WidgetResultInfos.ui \ - ../GUI/Widgets/WidgetModelsList.ui \ - ../GUI/Widgets/widgetloadexemodel.ui \ - ../GUI/Widgets/WidgetSelectEditVars.ui - -SOURCES += ../Core/OptObjective.cpp \ - ../Core/ParetoDominance.cpp \ - ../Core/Project.cpp \ - ../GUI/MainWindow.cpp \ - ../Core/Dymola/Dymola.cpp \ - ../Core/Dymola/ModPlusDymolaCtrl.cpp \ - ../Core/FileData/CSV.cpp \ - ../Core/FileData/LoadOMOptim.cpp \ - ../Core/FileData/SaveOMOptim.cpp \ - ../Core/Modelica/ModItem.cpp \ - ../Core/Modelica/ModItemsTree.cpp \ - ../Core/Modelica/ModComponent.cpp \ - ../Core/Modelica/ModelicaConnection.cpp \ - # ../Core/Modelica/ModelicaConnections.cpp \ - ../Core/Modelica/ModelicaModifier.cpp \ - ../Core/Modelica/ModExecution.cpp \ - ../Core/Modelica/ModModel.cpp \ - ../Core/Modelica/ModModelPlus.cpp \ - ../Core/Modelica/ModPackage.cpp \ - ../Core/Modelica/ModPlusCtrl.cpp \ - ../Core/Modelica/ModLoader.cpp \ - ../Core/Modelica/ModRecord.cpp \ - ../Core/OMC/MOomc.cpp \ - ../Core/OpenModelica/ModPlusOMCtrl.cpp \ - ../Core/OpenModelica/OpenModelica.cpp \ - ../Core/Problems/OneSimResult.cpp \ - ../Core/Problems/OneSimulation.cpp \ - ../Core/Problems/Optimization.cpp \ - ../Core/Problems/OptimResult.cpp \ - ../Core/Tools/reportingHook.cpp \ - ../Core/Tools/vqtconvert.cpp \ - ../GUI/Dialogs/AboutOMOptim.cpp \ - # ../GUI/Dialogs/BlockSubstituteConnDlg.cpp \ - ../GUI/Dialogs/newprojectform.cpp \ - #../GUI/Plots/MOPlot.cpp \ - ../GUI/Scene/arrow.cpp \ - # ../GUI/Scene/BlockDrawItem.cpp \ - # ../GUI/Scene/BlockSubsScene.cpp \ - ../GUI/Scene/diagramitem.cpp \ - ../GUI/Scene/diagramscene.cpp \ - ../GUI/Scene/diagramtextitem.cpp \ - ../GUI/Tabs/TabOMC.cpp \ - ../GUI/Tabs/TabOneSim.cpp \ - ../GUI/Tabs/TabOptimization.cpp \ - ../GUI/Tabs/TabProject.cpp \ - ../GUI/Tabs/TabResOneSim.cpp \ - ../GUI/Tabs/TabResOptimization.cpp \ - # ../GUI/Widgets/WidgetBlocks.cpp \ - ../GUI/Widgets/WidgetCalculateMooPoints.cpp \ - ../GUI/Widgets/WidgetMooPlot.cpp \ - ../GUI/Widgets/WidgetOneSimVars.cpp \ - ../GUI/Widgets/WidgetOptParameters.cpp \ - ../GUI/Widgets/WidgetOptTable.cpp \ - ../GUI/Widgets/WidgetProgress.cpp \ -# ../GUI/Widgets/WidgetSelectComponents.cpp \ - ../GUI/Widgets/WidgetSelectModModel.cpp \ - ../GUI/Widgets/WidgetSelectOptVars.cpp \ - ../GUI/Widgets/WidgetSelPointScan.cpp \ - ../GUI/Widgets/WidgetTableRecVar.cpp \ - ../GUI/Widgets/WidgetToolBar.cpp \ - ../GUI/Widgets/widgetloadexemodel.cpp\ - ../Core/Optim/EA/AlgoParameter.cpp \ - ../Core/Optim/EA/EABase.cpp \ - ../Core/Optim/EA/OptimAlgo.cpp \ -# ../Core/Problems/BlockSubs/BlockSubstitution.cpp \ -# ../Core/Problems/BlockSubs/BlockSubstitutions.cpp \ - ../Core/Optim/EA/Monitor/MyEoGnuplot.cpp \ - ../Core/Optim/EA/Monitor/MyEoGnuplot1DMonitor.cpp \ - ../Core/Optim/EA/NSGA2/NSGA2.cpp \ - ../Core/Optim/EA/SPEA2/SPEA2.cpp \ - ../Core/Optim/EA/SPEA2Adaptative/SPEA2Adapt.cpp \ - ../Core/OMC/OMCHelper.cpp \ - ../GUI/Widgets/WidgetMooPointsList.cpp \ - ../GUI/Widgets/WidgetProjectInfos.cpp \ - ../GUI/Widgets/WidgetProblemActions.cpp \ - ../Core/Optim/EA/SA1/SA1.cpp \ - ../Core/Optim/EA/PSO/PSO.cpp \ - ../Core/OptObjectives.cpp \ - ../Core/Modelica/ModPlusCtrls.cpp \ - ../GUI/Widgets/WidgetCtrlParameters.cpp \ - ../Core/Problems/optimizationinterface.cpp \ - ../Core/Problems/onesimulationinterface.cpp \ - ../GUI/Widgets/WidgetResultInfos.cpp \ - ../Core/OMC/OMCThreads.cpp \ - ../Core/VariablesManip.cpp \ - ../GUI/Tools/OMOptimGuiTools.cpp \ - ../Core/OMOptimSettings.cpp \ - ../GUI/Widgets/WidgetModelsList.cpp \ - ../Core/Optim/EA/OptimAlgosList.cpp \ - ../Core/ModPlusExeCtrl.cpp \ - ../Core/ModExePlus.cpp \ - ../Core/ModelPlus.cpp \ - ../Core/ExeModel.cpp \ - ../Core/Tools/ModPlusOMExeCtrl.cpp \ - ../Core/ModPlusDymolaExeCtrl.cpp \ - ../Core/ModPlusBlackBoxExeCtrl.cpp \ - ../scriptparseromoptim.cpp \ - ../GUI/Widgets/WidgetSelectEditVars.cpp \ - ../Core/OMC/ComponentInfo.cpp \ - ../Core/Util/Helper.cpp \ - ../Core/Util/StringHandler.cpp \ - ../Core/Util/Utilities.cpp - #../Core/ModPlusTherExeCtrl.cpp - -CONFIG(debug, debug|release){ - DEFINES+=DEBUG - TARGET = $$join(TARGET,,,d) - message("OMOptimLibDebug") -} - -win32 { - include(OMOptim.windowsconfig.in) -}else { - include(OMOptim.config) -} - -# OMOptim drives the OpenModelica compiler in-process and uses the -# MMC_TRY_TOP/threadData macros, which reference threadData->parentMutex. -# That member only exists when OM_HAVE_PTHREADS is defined (as OMEdit does), -# so define it here for all platforms. -DEFINES += OM_HAVE_PTHREADS diff --git a/OMOptim/buildOMOptim.pro b/OMOptim/buildOMOptim.pro deleted file mode 100644 index 60bb5f22..00000000 --- a/OMOptim/buildOMOptim.pro +++ /dev/null @@ -1,73 +0,0 @@ -# This file is part of OpenModelica. -# -# Copyright (c) 1998-2026, Open Source Modelica Consortium (OSMC), -# c/o Linköpings universitet, Department of Computer and Information Science, -# SE-58183 Linköping, Sweden. -# -# All rights reserved. -# -# THIS PROGRAM IS PROVIDED UNDER THE TERMS OF AGPL VERSION 3 LICENSE OR -# THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8. -# ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES -# RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GNU AGPL -# VERSION 3, ACCORDING TO RECIPIENTS CHOICE. -# -# The OpenModelica software and the OSMC (Open Source Modelica Consortium) -# Public License (OSMC-PL) are obtained from OSMC, either from the above -# address, from the URLs: -# http://www.openmodelica.org or -# https://github.com/OpenModelica/ or -# http://www.ida.liu.se/projects/OpenModelica, -# and in the OpenModelica distribution. -# -# GNU AGPL version 3 is obtained from: -# https://www.gnu.org/licenses/licenses.html#GPL -# -# This program is distributed WITHOUT ANY WARRANTY; without -# even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH -# IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. -# -# See the full OSMC Public License conditions for more details. - -### This .pro file also asks to build OMOptimBasis -TEMPLATE = subdirs -CONFIG += ordered - - -SUBDIRS += OMOptimBasis \ - OMOptimLib \ - OMOptim - - -OMOptimBasis.file = ../OMOptimBasis/build/OMOptimBasis.pro - -OMOptimLib.file = build/OMOptimLib.pro -OMOptimLib.depends = OMOptimBasis - -OMOptim.file = build/OMOptim.pro -OMOptim.depends = OMOptimLib - - -## copy dependent files after compiling -win32 { - release_libs.files = - release_libs.path = ./bin - - debug_libs.files = - debug_libs.path = ./bin - - -CONFIG(debug, debug|release){ - INSTALLS += debug_libs -}else{ - message("Release libs") - INSTALLS += release_libs -} - -} - -unix { - ## For unix builds - # MY_LIB_FILES += $$QMAKE_LIBDIR_QT/...xxxxxx.... -} diff --git a/OMOptimBasis/build/Makefile.unix.in b/OMOptimBasis/build/Makefile.unix.in deleted file mode 100644 index 57bde13f..00000000 --- a/OMOptimBasis/build/Makefile.unix.in +++ /dev/null @@ -1,28 +0,0 @@ -.PHONY: install build $(NAME) always - -top_dir=../../ -NAME=OMOptimBasis -DEST=. -EXE=@EXE@ -QMAKE=@QMAKE@ - -default: build - -always: - -$(NAME): Makefile $(NAME).config - $(MAKE) -f Makefile - -build: $(NAME) - -Makefile: $(NAME).pro $(NAME).config - $(QMAKE) $< -Makefile.unix: Makefile.unix.in - (cd $(top_dir); ./config.status) -$(NAME).config: $(NAME).config.in - (cd $(top_dir); ./config.status) - -clean: - test ! -f Makefile || $(MAKE) -f Makefile clean - rm -f *.o *.so* *.a - diff --git a/OMOptimBasis/build/OMOptimBasis.config.in b/OMOptimBasis/build/OMOptimBasis.config.in deleted file mode 100644 index 562fdbeb..00000000 --- a/OMOptimBasis/build/OMOptimBasis.config.in +++ /dev/null @@ -1,8 +0,0 @@ -QMAKE_CC = @CC@ -QMAKE_CXX = @CXX@ -QMAKE_LINK = @CXX@ - -LIBS += -L@OPENMODELICAHOME@/lib/@host_short@/omc -lomqwt @RPATH_QMAKE@ -INCLUDEPATH += @OPENMODELICAHOME@/include/omplot/qwt - -QMAKE_LFLAGS += @LDFLAGS@ diff --git a/OMOptimBasis/build/OMOptimBasis.pro b/OMOptimBasis/build/OMOptimBasis.pro deleted file mode 100644 index 87dbea5a..00000000 --- a/OMOptimBasis/build/OMOptimBasis.pro +++ /dev/null @@ -1,269 +0,0 @@ -# This file is part of OpenModelica. -# -# Copyright (c) 1998-2026, Open Source Modelica Consortium (OSMC), -# c/o Linköpings universitet, Department of Computer and Information Science, -# SE-58183 Linköping, Sweden. -# -# All rights reserved. -# -# THIS PROGRAM IS PROVIDED UNDER THE TERMS OF AGPL VERSION 3 LICENSE OR -# THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8. -# ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES -# RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GNU AGPL -# VERSION 3, ACCORDING TO RECIPIENTS CHOICE. -# -# The OpenModelica software and the OSMC (Open Source Modelica Consortium) -# Public License (OSMC-PL) are obtained from OSMC, either from the above -# address, from the URLs: -# http://www.openmodelica.org or -# https://github.com/OpenModelica/ or -# http://www.ida.liu.se/projects/OpenModelica, -# and in the OpenModelica distribution. -# -# GNU AGPL version 3 is obtained from: -# https://www.gnu.org/licenses/licenses.html#GPL -# -# This program is distributed WITHOUT ANY WARRANTY; without -# even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH -# IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. -# -# See the full OSMC Public License conditions for more details. - -TEMPLATE = lib -TARGET = OMOptimBasis -CONFIG += staticlib warn_off - -include(../vars.pri) - -QT += core gui xml printsupport widgets -equals(QT_MAJOR_VERSION, 6) { - QT += core5compat -} - -CONFIG(debug, debug|release){ - LIBS += -L$$(OMBUILDDIR)/lib/omc -lomqwtd - DESTDIR = ../bin - UI_DIR = debug/generatedfiles/ui - OBJECTS_DIR = debug/generatedfiles - MOC_DIR = debug/generatedfiles/moc - RCC_DIR = debug/generatedfiles/rcc - INCLUDEPATH += debug/generatedfiles/ui - -}else { - LIBS += -L$$(OMBUILDDIR)/lib/omc -lomqwt - DESTDIR = ../bin - UI_DIR = release/generatedfiles/ui - OBJECTS_DIR = release/generatedfiles - MOC_DIR = release/generatedfiles/moc - RCC_DIR = release/generatedfiles/rcc - INCLUDEPATH += release/generatedfiles/ui -} - - -win32 { - include(OMOptimBasis.windowsconfig.in) -}else { - include(OMOptimBasis.config) -} - -CONFIG(debug, debug|release){ - DEFINES+=DEBUG - TARGET = $$join(TARGET,,,d) -} - -INCLUDEPATH += . \ - .. \ - ../GUI \ - ../GUI/Widgets \ - ../GUI/Tools \ - ../GUI/Dialogs \ - ../Units \ - ../Tools \ - ../Infos \ - ../FileData \ - ../Problems - -DEPENDPATH += . \ - .. \ - ../GUI \ - ../GUI/Widgets \ - ../GUI/Tools \ - ../GUI/Dialogs \ - ../Units \ - ../Tools \ - ../Infos \ - ../FileData \ - ../Problems - -HEADERS += \ - ../Variable.h \ - ../MOVector.h \ - ../MOThreads.h \ - ../GUI/MOTableView.h \ - ../MOParameter.h \ - ../MOOptVector.h \ - ../MOItem.h \ - ../Variables.h \ - ../GUI/Widgets/WidgetMOItem.h \ - ../GUI/Widgets/WidgetFilesList.h \ - ../VariableType.h \ - ../Units/METemperature.h \ - ../Units/MESurface.h \ - ../Units/MESpecHeatCapacity.h \ - ../Units/MERefValue.h \ - ../Units/MEQflow.h \ - ../Units/MEMassFlow.h \ - ../Units/MEHTCoeff.h \ - ../Units/MEDimValue.h \ - ../Units/Units.h \ - ../Tools/SleeperThread.h \ - ../Tools/LowTools.h \ - ../Tools/XMLTools.h \ - ../Problems/Result.h \ - ../Problems/Problems.h \ - ../Problems/ProblemInterface.h \ - ../Problems/ProblemConfig.h \ - ../Problems/Problem.h \ - ../Problems/OMCases.h \ - ../Problems/OMCase.h \ - ../Problems/Results.h \ - ../Infos/InfoSender.h \ - ../Infos/Info.h \ - ../Infos/ListInfo.h \ - ../GUI/Tools/qsciencespinbox.h \ - ../FileData/Save.h \ - ../FileData/Load.h \ - ../FileData/CSVBase.h \ - ../FileData/XML.h \ - ../ProjectBase.h \ - ../MOSettings.h \ - ../Tools/HighTools.h \ - ../GUI/Dialogs/MOParametersDlg.h \ - ../Tools/OMProcess.h \ - ../GUI/Tools/MyTreeView.h \ - ../GUI/Tools/MyTextLog.h \ - ../GUI/Tools/MyDelegates.h \ - ../GUI/Tools/MOStyleSheet.h \ - ../GUI/Tools/MOSplitter.h \ - ../GUI/Tools/GuiTools.h \ - ../GUI/Tabs/TabGeneric.h \ - ../GUI/Tabs/MOTabBase.h \ - ../GUI/Tabs/MOTab.h \ - ../GUI/Tabs/MOMainTab.h \ - ../GUI/Tabs/MO2ColTab.h \ - ../GUI/Widgets/WidgetTableVar.h \ - ../GUI/Plots/MOPlot.h \ - ../GUI/Plots/MyQwtPlotPicker.h \ - ../GUI/Tabs/TabProjectBase.h \ - ../GUI/Widgets/WidgetProjectBaseInfos.h \ - ../GUI/Dialogs/DlgSettings.h \ - ../GUI/Dialogs/DlgSelectVars.h \ - ../GUI/Dialogs/DlgSelectFiles.h \ - ../GUI/Widgets/WidgetSelectVars.h \ - ../GUI/Widgets/WidgetList.h \ - ../GUI/Dialogs/NewProjectBaseForm.h \ - ../Problems/ProblemInterfaces.h \ - ../MOVectors.h \ - ../registermetatypes.h \ - ../Units/METime.h \ - ../GUI/Dialogs/DlgSelect.h \ - ../GUI/Widgets/WidgetMOItemsList.h \ - ../MOItemModel.h \ - ../GUI/MOItemViews.h \ - ../Units/MEGeneric.h \ - ../scriptparser.h \ - ../GUI/Dialogs/ScriptTextDlg.h \ - ../GUI/Dialogs/HelpDlg.h \ - ../GUI/ConsoleWindow.h - -SOURCES += \ - ../Variables.cpp \ - ../Variable.cpp \ - ../MOThreads.cpp \ - ../GUI/MOTableView.cpp \ - ../MOParameter.cpp \ - ../MOOptVector.cpp \ - ../MOItem.cpp \ - ../GUI/Widgets/WidgetMOItem.cpp \ - ../GUI/Widgets/WidgetFilesList.cpp \ - ../Units/METemperature.cpp \ - ../Units/MESurface.cpp \ - ../Units/MESpecHeatCapacity.cpp \ - ../Units/MERefValue.cpp \ - ../Units/MEQflow.cpp \ - ../Units/MEMassFlow.cpp \ - ../Units/MEHTCoeff.cpp \ - ../Units/MEDimValue.cpp \ - ../Tools/XMLTools.cpp \ - ../Tools/LowTools.cpp \ - ../Problems/Results.cpp \ - ../Problems/Result.cpp \ - ../Problems/Problems.cpp \ - ../Problems/ProblemInterface.cpp \ - ../Problems/ProblemConfig.cpp \ - ../Problems/Problem.cpp \ - ../Problems/OMCases.cpp \ - ../Problems/OMCase.cpp \ - ../Infos/InfoSender.cpp \ - ../Infos/Info.cpp \ - ../GUI/Tools/qsciencespinbox.cpp \ - ../FileData/XML.cpp \ - ../FileData/Save.cpp \ - ../FileData/Load.cpp \ - ../FileData/CSVBase.cpp \ - ../ProjectBase.cpp \ - ../MOSettings.cpp \ - ../Tools/HighTools.cpp \ - ../GUI/Dialogs/MOParametersDlg.cpp \ - ../Tools/OMProcess.cpp \ - ../GUI/Tools/MyTreeView.cpp \ - ../GUI/Tools/MyTextLog.cpp \ - ../GUI/Tools/MyDelegates.cpp \ - ../GUI/Tools/MOStyleSheet.cpp \ - ../GUI/Tools/MOSplitter.cpp \ - ../GUI/Tools/GuiTools.cpp \ - ../GUI/Tabs/TabGeneric.cpp \ - ../GUI/Tabs/MOTabBase.cpp \ - ../GUI/Tabs/MOTab.cpp \ - ../GUI/Tabs/MOMainTab.cpp \ - ../GUI/Tabs/MO2ColTab.cpp \ - ../GUI/Widgets/WidgetTableVar.cpp \ - ../GUI/Plots/MyQwtPlotPicker.cpp \ - ../GUI/Plots/MOPlot.cpp \ - ../GUI/Tabs/TabProjectBase.cpp \ - ../GUI/Widgets/WidgetProjectBaseInfos.cpp \ - ../GUI/Dialogs/DlgSettings.cpp \ - ../GUI/Dialogs/DlgSelectVars.cpp \ - ../GUI/Dialogs/DlgSelectFiles.cpp \ - ../GUI/Widgets/WidgetSelectVars.cpp \ - ../GUI/Widgets/WidgetList.cpp \ - ../GUI/Dialogs/NewProjectBaseForm.cpp \ - ../Problems/ProblemInterfaces.cpp \ - ../registermetatypes.cpp \ - ../Units/METime.cpp \ - ../GUI/Dialogs/DlgSelect.cpp \ - ../GUI/Widgets/WidgetMOItemsList.cpp \ - ../MOItemModel.cpp \ - ../GUI/MOItemViews.cpp \ - ../Units/MEGeneric.cpp \ - ../scriptparser.cpp \ - ../GUI/Dialogs/ScriptTextDlg.cpp \ - ../GUI/Dialogs/HelpDlg.cpp \ - ../GUI/ConsoleWindow.cpp - -FORMS += \ - ../GUI/Widgets/WidgetFilesList.ui \ - ../GUI/Widgets/WidgetMOItem.ui \ - ../GUI/Tabs/TabGeneric.ui \ - ../GUI/Tabs/TabProjectBase.ui \ - ../GUI/Widgets/WidgetProjectBaseInfos.ui \ - ../GUI/Widgets/WidgetSelectVars.ui \ - ../GUI/Dialogs/NewProjectBaseForm.ui \ - ../GUI/Widgets/WidgetMOItemsList.ui \ - ../GUI/Dialogs/ScriptTextDlg.ui \ - ../GUI/Dialogs/HelpDlg.ui \ - ../GUI/ConsoleWindow.ui - -RESOURCES += \ - ../GUI/Resources/OMOptimBasis.qrc diff --git a/OMOptimBasis/build/OMOptimBasis.windowsconfig.in b/OMOptimBasis/build/OMOptimBasis.windowsconfig.in deleted file mode 100644 index b277f967..00000000 --- a/OMOptimBasis/build/OMOptimBasis.windowsconfig.in +++ /dev/null @@ -1,45 +0,0 @@ - -## defines qwthome -QMAKE_LFLAGS += -Wl,--enable-auto-import -QMAKE_CXXFLAGS_WARN_OFF += -Wunused-parameter - -_cxx = $$(CXX) -equals(_cxx, clang++) { - message("Found clang++ on windows in $CXX, removing unknown flags: -fno-keep-inline-dllexport") - QMAKE_CFLAGS -= -fno-keep-inline-dllexport - QMAKE_CXXFLAGS -= -fno-keep-inline-dllexport -} - - -DEFINES += __x86__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ \ - WIN32 \ - _WINDOWS \ - _USRDLL \ - _CRT_SECURE_NO_DEPRECATE \ - _WIN32_WINNT=0x0400 \ - _MBCS - - # win32 vs. win64 - UNAME = $$system(uname) - isEmpty(UNAME): UNAME = MINGW32 - ISMINGW32 = $$find(UNAME, MINGW32) - message(uname: $$UNAME) - count( ISMINGW32, 1 ) { - DEFINES += __x86__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ - } else { - DEFINES += __x86__ \ - __x86_64__ \ - __NT__ \ - __OSVERSION__=4 \ - __WIN32__ \ - _WIN64 \ - MS_WIN64 - } - -INCLUDEPATH += $$(OMBUILDDIR)/include/omplot/qwt diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 5750742b..00000000 --- a/configure.ac +++ /dev/null @@ -1,69 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.63]) -AC_INIT([OMOptim],[dev],[https://trac.openmodelica.org/OpenModelica],[openmodelica],[https://openmodelica.org]) - -AC_SUBST(OMOPTIMCXX) -AC_SUBST(APP) -AC_SUBST(EXE) -AC_SUBST(IDLCMD) -AC_SUBST(RPATH_QMAKE) -AC_SUBST(host_short) -AC_SUBST(SOURCE_REVISION) -AC_SUBST(LSB_RELEASE) - - -m4_include([common/m4/pre-commit.m4]) -cp common/install-sh common/config.guess common/config.sub ./ -m4_include([common/m4/ombuilddir.m4]) - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -rm install-sh - -dnl Checks for programs. - -AC_MSG_CHECKING([if clang++ is used (OMOptim breaks clang++)]) -if test ! -z "$GNUCXX"; then - AC_MSG_RESULT([found explicit GNUCXX; using that]) - CXX="$GNUCXX" -elif echo "$CXX" | grep -q "clang++"; then - AC_MSG_RESULT([yes; resetting CXX to default autoconf compiler (sorry). Use ./configure GNUCXX=g++ to use clang++ for some projects and g++ only for paradiseo]) - unset CXX -else - AC_MSG_RESULT([no]) -fi - -AC_LANG([C++]) -AC_PROG_CXX -AC_PROG_CC - -host_short=$host_cpu-$host_os - -m4_include([common/m4/qmake.m4]) -m4_include([common/m4/omhome.m4]) - -FIND_OPENMODELICAHOME() - -FIND_LIBOMQWT() - -dnl OMOptim now talks to OMC in-process through libOpenModelicaCompiler (the same -dnl way OMEdit does), so the old CORBA / omniORB interface is no longer required -dnl (issue #14506). - -AC_MSG_CHECKING([for LSB description]) -LSB_RELEASE="`lsb_release -ds | tr -d '\"'`" -if test ! -z "$LSB_RELEASE"; then - AC_MSG_RESULT([$LSB_RELEASE]) - LSB_RELEASE="#define LSB_RELEASE \"$LSB_RELEASE\"" -else - AC_MSG_RESULT([no]) -fi - -m4_include([common/m4/semver.m4]) -SOURCE_REVISION="$SOURCE_REVISION$NON_FREE_VERSION" - -AC_OUTPUT(Makefile OMOptim/build/Makefile.unix OMOptim/build/OMOptim.config OMOptimBasis/build/Makefile.unix OMOptimBasis/build/OMOptimBasis.config OMOptim/omc_config.h) -# AC_CONFIG_COMMANDS([Clean qmake stuff],[make clean]) From dc90769c8ca90acd7fa7e83d0fa6370fa54199a0 Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Mon, 24 Aug 2026 11:33:10 +0200 Subject: [PATCH 2/2] Remove unused common submodule --- .gitmodules | 3 --- common | 1 - 2 files changed, 4 deletions(-) delete mode 100644 .gitmodules delete mode 160000 common diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9dd137c2..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "common"] - path = common - url = ../OpenModelica-common.git diff --git a/common b/common deleted file mode 160000 index 08a01802..00000000 --- a/common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 08a01802db5ba5edb540383c46718b89ff229ef2