Skip to content

Commit

Permalink
Install the pre-commit hook for clients
Browse files Browse the repository at this point in the history
Killed tabs
Fixed OMPlot link

Belonging to [master]:
  - #117
  • Loading branch information
adeas31 authored and OpenModelica-Hudson committed Apr 3, 2019
1 parent a9c9afa commit e4d2870
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions OMEdit/Makefile.omdev.mingw
Expand Up @@ -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
Expand Down
Expand Up @@ -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"));
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/README.md
Expand Up @@ -4,7 +4,7 @@ A Modelica connection editor for OpenModelica.
## Dependencies

- [OpenModelica](https://openmodelica.org)
- [OMPlot](../../OMPlot)
- [OMPlot](../OMPlot)
- [OMSimulator](../../../../OMSimulator)

## Build instructions
Expand Down
1 change: 1 addition & 0 deletions OMNotebook/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/README.md
Expand Up @@ -4,7 +4,7 @@ A Mathematica-style Notebook for OpenModelica.
## Dependencies

- [OpenModelica](https://openmodelica.org)
- [OMPlot](../../OMPlot)
- [OMPlot](../OMPlot)

## Build instructions

Expand Down
1 change: 1 addition & 0 deletions OMPlot/Makefile.omdev.mingw
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions OMShell/OMShell/OMShellGUI/Makefile.omdev.mingw
Expand Up @@ -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

0 comments on commit e4d2870

Please sign in to comment.