Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update OMEdit and 3rdParty to the latest from master:
de76be5 Fixes ticket:5326 show public connectors of encrypted package a0ee60a Chinese translations update from LI Wenhui 5041c4b Better error message 75a82ae Fixed display of absolute font size texts 05c2ae9 Fixes ticket:5801 Use default Modelica specification values 27a58f1 Fixed OMSens so file on Linux & ErrorMessage 9ff2eee Enable OMSens menu items except on MAC 0c2bebf Hide the OMSens menu item until 932130d Added OMSens_Qt to configure script 0c802bd Implemented plugins interface 244a0ca ticket:5778 Fixed users guide links f60ffbd Don't apply the filter using the path f89d5be ticket:5760 Preserve the scroll position in documentation browser 0a7b784 Ticket:5682 Added a setting to enable the nfAPINoise flag 54e20a0 Fixes ticket:5733 Don't use the qualified path b4ce992 Test the parsing of placement annotation string 2a7939a Connect the variables widget with the debugger (#636) 4de19b4 Updated instructions c3a557c ticket:5671 Handle the coordinate system change 9c5134d Hide the Git menu item until the feature is fully implemented ee29dc4 Fixes ticket:5716 Clear the items when redrawing the views c5243a7 ticket:5704 Remove the connection from the scene 028aa55 Show text ellipses when font is below minimum size 0c73ae2 Delete the items that are not part of the scene 724446d Fixed ticket:5691 first remove the item, draw it and then add it 288be75 Allow setting the visualization on repeat b66d30c Test the OMEdit diagrams 1694d34 Build and run OMEdit testsuite 479e6ff Avoid crashing when placement annotation is in wrong format cc6e3e8 Restructured & added a GUI testing framework
- Loading branch information
Showing
488 changed files
with
2,290 additions
and
857 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| all: omedit | ||
|
|
||
| resourcedir=./OMEditLIB/Resources/nls/ | ||
|
|
||
| NAME=OMEdit | ||
| APP=@APP@ | ||
| LIB=libOMEdit | ||
| LIBEXE=.a | ||
| QMAKE=@QMAKE@ | ||
| LRELEASE=@LRELEASE@ | ||
|
|
||
| CMAKE=CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" cmake | ||
| CMAKE_TARGET = "Unix Makefiles" | ||
|
|
||
| install: build OMEditLIB/Resources/nls/qm.stamp | ||
| cp -p $(resourcedir)/*.qm @OMBUILDDIR@/share/omedit/nls/ | ||
| if [ "$(APP)" = ".app" ]; then mkdir -p @OMBUILDDIR@/Applications/ ; cp -rp bin/OMEdit$(APP) @OMBUILDDIR@/Applications/ ; else cp -p bin/OMEdit @OMBUILDDIR@/bin/; fi | ||
| cp -p bin/$(LIB)$(LIBEXE) @OMBUILDDIR@/lib/@host_short@/omc/ | ||
|
|
||
| OMEditLIB/Resources/nls/qm.stamp: OMEditLIB/OMEditLIB.pro OMEditLIB/Resources/nls/*.ts | ||
| $(LRELEASE) $< | ||
| @touch $@ | ||
|
|
||
| $(NAME): parsergen qjson-build Makefile OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri omc_config.h | ||
| $(MAKE) -f Makefile | ||
|
|
||
| build: $(NAME) | ||
|
|
||
| parsergen: | ||
| $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.unix | ||
|
|
||
| Makefile: OMEdit.pro OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri | ||
| @test ! -f $@ || rm $@ | ||
| $(QMAKE) -r | ||
| Makefile.unix: Makefile.unix.in | ||
| (cd @top_builddir@; ./config.status) | ||
| OMEditLIB/OMEditLIB.unix.config.pri: OMEditLIB/OMEditLIB.unix.config.pri.in | ||
| (cd @top_builddir@ && ./config.status) | ||
| OMEditGUI/OMEditGUI.unix.config.pri: OMEditGUI/OMEditGUI.unix.config.pri.in | ||
| (cd @top_builddir@ && ./config.status) | ||
| omc_config.h: omc_config.h.in | ||
| (cd @top_builddir@ && ./config.status) | ||
|
|
||
| mkbuilddirs: | ||
| mkdir -p @OMBUILDDIR@/share/omedit/nls @OMBUILDDIR@/bin @OMBUILDDIR@/lib/@host_short@/omc | ||
| omedit: mkbuilddirs install | ||
|
|
||
| clean: | ||
| test ! -f qjson/build/Makefile || $(MAKE) -C qjson/build clean | ||
| rm -rf qjson/build | ||
| $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.unix clean | ||
| test ! -f Makefile || $(MAKE) -f Makefile clean | ||
| rm -f bin/OMEdit$(APP) bin/$(LIB)$(LIBEXE) | ||
| rm -rf omc_config.h Makefile OMEditLIB/debug OMEditLIB/release OMEditLIB/generatedfiles OMEditLIB/Makefile OMEditLIB/Makefile.Debug OMEditLIB/Makefile.Release OMEditLIB/object_script.* OMEditGUI/debug OMEditGUI/release OMEditGUI/Makefile OMEditGUI/Makefile.Debug OMEditGUI/Makefile.Release | ||
|
|
||
| distclean: clean | ||
| rm -rf config.log config.sub config.status install-sh autom4te.cache config.guess configure Makefile.unix OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri | ||
|
|
||
| config.status: configure | ||
| ./config.status -recheck | ||
| configure: configure.ac common/m4/corba.m4 common/m4/omhome.m4 common/m4/qmake.m4 | ||
| autoconf | ||
|
|
||
| qjson-build: | ||
| test -d qjson | ||
| mkdir -p qjson/build/include/qjson | ||
| (cd qjson/build && test -f Makefile || CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" $(CMAKE) .. @QT4BUILD@ -G $(CMAKE_TARGET)) | ||
| test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build | ||
| test ! `uname` = Darwin || install_name_tool -id @rpath/libqjson.0.dylib qjson/build/lib/libqjson.0.dylib | ||
| cp -a qjson/build/lib/libqjson*$(SHREXT)* @OMBUILDDIR@/lib/@host_short@/omc/ | ||
| cp -a qjson/src/*.h qjson/build/include/qjson |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # | ||
| # This file is part of OpenModelica. | ||
| # | ||
| # Copyright (c) 1998-CurrentYear, 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 GPL VERSION 3 LICENSE OR | ||
| # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. | ||
| # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE | ||
| # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. | ||
| # | ||
| # The OpenModelica software and the Open Source Modelica | ||
| # Consortium (OSMC) Public License (OSMC-PL) are obtained | ||
| # from OSMC, either from the above address, | ||
| # from the URLs: http://www.ida.liu.se/projects/OpenModelica or | ||
| # http://www.openmodelica.org, and in the OpenModelica distribution. | ||
| # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. | ||
| # | ||
| # 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 = subdirs | ||
|
|
||
| CONFIG += ordered | ||
|
|
||
| SUBDIRS = OMEditLIB \ | ||
| OMEditGUI | ||
|
|
||
| OMEditGUI.depends = OMEditLIB |
Oops, something went wrong.