diff --git a/OMEdit/Makefile.omdev.mingw b/OMEdit/Makefile.omdev.mingw index 044c1c7224e..dee9b4e4ef1 100644 --- a/OMEdit/Makefile.omdev.mingw +++ b/OMEdit/Makefile.omdev.mingw @@ -27,6 +27,7 @@ mkbuilddirs: omedit: mkbuilddirs qjson-build $(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw + cp -puf ../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit clean: cd qjson && rm -rf build diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp b/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp index 63b14da6552..598a96c8882 100644 --- a/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp +++ b/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp @@ -75,7 +75,7 @@ AbstractAnimationWindow::AbstractAnimationWindow(QWidget *pParent) mpRotateCameraLeftAction(nullptr), mpRotateCameraRightAction(nullptr), mCameraInitialized(false), - mSliderRange(1000) + mSliderRange(1000) { // to distinguish this widget as a subwindow among the plotwindows setObjectName(QString("animationWindow")); diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp b/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp index d64404c9f85..eaedc68c8ee 100644 --- a/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp +++ b/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp @@ -45,7 +45,7 @@ TimeManager::TimeManager(const double simTime, const double realTime, const doub _endTime(endTime), _pause(true), mSpeedUp(1.0), - mTimeDiscretization(1000) + mTimeDiscretization(1000) { mpUpdateSceneTimer = new QTimer; mpUpdateSceneTimer->setInterval(100); diff --git a/OMEdit/README.md b/OMEdit/README.md index a21df8ce0eb..897f23ef200 100644 --- a/OMEdit/README.md +++ b/OMEdit/README.md @@ -4,7 +4,7 @@ A Modelica connection editor for OpenModelica. ## Dependencies - [OpenModelica](https://openmodelica.org) -- [OMPlot](../../OMPlot) +- [OMPlot](../OMPlot) - [OMSimulator](../../../../OMSimulator) ## Build instructions diff --git a/OMNotebook/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw b/OMNotebook/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw index 72550607dfd..c9846aedd85 100644 --- a/OMNotebook/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw +++ b/OMNotebook/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw @@ -53,6 +53,7 @@ build: omc_config.h $(NAME) Resources/nls/qm.stamp mkdir -p $$DIRS) && \ cd ../../DrControl/ && \ find . -name \*.onb -exec cp {} $(builddir_share)/omnotebook/drcontrol/{} \;) + cp -puf ../../../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit Makefile: OMNotebookGUI.pro $(QMAKE) "CONFIG+=release" diff --git a/OMNotebook/README.md b/OMNotebook/README.md index 2c153a9a7be..faf86c77ba5 100644 --- a/OMNotebook/README.md +++ b/OMNotebook/README.md @@ -4,7 +4,7 @@ A Mathematica-style Notebook for OpenModelica. ## Dependencies - [OpenModelica](https://openmodelica.org) -- [OMPlot](../../OMPlot) +- [OMPlot](../OMPlot) ## Build instructions diff --git a/OMPlot/Makefile.omdev.mingw b/OMPlot/Makefile.omdev.mingw index 8250349f711..58271000cd3 100644 --- a/OMPlot/Makefile.omdev.mingw +++ b/OMPlot/Makefile.omdev.mingw @@ -8,6 +8,7 @@ buildlib=$(OMBUILDDIR)/lib/omc omplot: mkbuilddirs qwt $(MAKE) -C OMPlot/OMPlotGUI -f Makefile.omdev.mingw + cp -puf ../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit $(buildlib)/libomqwt.a: mkbuilddirs qwt-build diff --git a/OMShell/OMShell/OMShellGUI/Makefile.omdev.mingw b/OMShell/OMShell/OMShellGUI/Makefile.omdev.mingw index 847fbc2cab8..9baf8ace3fe 100644 --- a/OMShell/OMShell/OMShellGUI/Makefile.omdev.mingw +++ b/OMShell/OMShell/OMShellGUI/Makefile.omdev.mingw @@ -28,3 +28,4 @@ build: $(NAME) cp -p ../bin/$(NAME)$(EXE) $(builddir_bin) cp -p commands.xml $(builddir_share)/omshell/ cp -p OMShell_*.qm $(builddir_share)/omshell/nls/ + cp -puf ../../../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit