Skip to content

Commit

Permalink
- Changed the settings of all OM clients so that generatedfiles are c…
Browse files Browse the repository at this point in the history
…reated in a separate directories.

- Few updates of OMEdit

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8115 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adeas31 committed Mar 6, 2011
1 parent 871f1fd commit 083ec3b
Show file tree
Hide file tree
Showing 5 changed files with 616 additions and 0 deletions.
145 changes: 145 additions & 0 deletions OMShell/OMShellGUI/Makefile
@@ -0,0 +1,145 @@
#############################################################################
# Makefile for building: OMShell
# Generated by qmake (2.01a) (Qt 4.7.0) on: sö 6. mar 04:02:20 2011
# Project: OMShellGUI.pro
# Template: app
# Command: c:\qt\2010.05\qt\bin\qmake.exe -spec ..\..\..\..\Qt\2010.05\qt\mkspecs\win32-g++ CONFIG+=release -o Makefile OMShellGUI.pro
#############################################################################

first: release
install: release-install
uninstall: release-uninstall
MAKEFILE = Makefile
QMAKE = c:\qt\2010.05\qt\bin\qmake.exe
DEL_FILE = del
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
COPY = copy /y
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)
DEL_FILE = del
SYMLINK =
DEL_DIR = rmdir
MOVE = move
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
SUBTARGETS = \
release \
debug

release: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_default: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_first: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release first
release-all: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release all
release-clean: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release clean
release-distclean: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release distclean
release-install: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release install
release-uninstall: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall
debug: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_default: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug first
debug-all: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug all
debug-clean: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug clean
debug-distclean: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug distclean
debug-install: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall

Makefile: OMShellGUI.pro ../../../../Qt/2010.05/qt/mkspecs/win32-g++/qmake.conf ../../../../Qt/2010.05/qt/mkspecs/qconfig.pri \
../../../../Qt/2010.05/qt/mkspecs/modules/qt_webkit_version.pri \
../../../../Qt/2010.05/qt/mkspecs/features/qt_functions.prf \
../../../../Qt/2010.05/qt/mkspecs/features/qt_config.prf \
../../../../Qt/2010.05/qt/mkspecs/features/exclusive_builds.prf \
../../../../Qt/2010.05/qt/mkspecs/features/default_pre.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/default_pre.prf \
../../../../Qt/2010.05/qt/mkspecs/features/release.prf \
../../../../Qt/2010.05/qt/mkspecs/features/debug_and_release.prf \
../../../../Qt/2010.05/qt/mkspecs/features/default_post.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/default_post.prf \
../../../../Qt/2010.05/qt/mkspecs/features/warn_off.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/rtti.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/exceptions.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/stl.prf \
../../../../Qt/2010.05/qt/mkspecs/features/shared.prf \
../../../../Qt/2010.05/qt/mkspecs/features/qt.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/thread.prf \
../../../../Qt/2010.05/qt/mkspecs/features/moc.prf \
../../../../Qt/2010.05/qt/mkspecs/features/win32/windows.prf \
../../../../Qt/2010.05/qt/mkspecs/features/resources.prf \
../../../../Qt/2010.05/qt/mkspecs/features/uic.prf \
../../../../Qt/2010.05/qt/mkspecs/features/yacc.prf \
../../../../Qt/2010.05/qt/mkspecs/features/lex.prf \
c:/Qt/2010.05/qt/lib/qtmain.prl
$(QMAKE) -spec ..\..\..\..\Qt\2010.05\qt\mkspecs\win32-g++ CONFIG+=release -o Makefile OMShellGUI.pro
..\..\..\..\Qt\2010.05\qt\mkspecs\qconfig.pri:
..\..\..\..\Qt\2010.05\qt\mkspecs\modules\qt_webkit_version.pri:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt_functions.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt_config.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\exclusive_builds.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\default_pre.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\default_pre.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\release.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\debug_and_release.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\default_post.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\default_post.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\warn_off.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\rtti.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\exceptions.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\stl.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\shared.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\thread.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\moc.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\windows.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\resources.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\uic.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\yacc.prf:
..\..\..\..\Qt\2010.05\qt\mkspecs\features\lex.prf:
c:\Qt\2010.05\qt\lib\qtmain.prl:
qmake: qmake_all FORCE
@$(QMAKE) -spec ..\..\..\..\Qt\2010.05\qt\mkspecs\win32-g++ CONFIG+=release -o Makefile OMShellGUI.pro

qmake_all: FORCE

make_default: release-make_default debug-make_default FORCE
make_first: release-make_first debug-make_first FORCE
all: release-all debug-all FORCE
clean: release-clean debug-clean FORCE
distclean: release-distclean debug-distclean FORCE
-$(DEL_FILE) Makefile

check: first

release-mocclean: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocclean
debug-mocclean: $(MAKEFILE).Debug
$(MAKE) -f $(MAKEFILE).Debug mocclean
mocclean: release-mocclean debug-mocclean

release-mocables: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocables
debug-mocables: $(MAKEFILE).Debug
$(MAKE) -f $(MAKEFILE).Debug mocables
mocables: release-mocables debug-mocables
FORCE:

$(MAKEFILE).Release: Makefile
$(MAKEFILE).Debug: Makefile
221 changes: 221 additions & 0 deletions OMShell/OMShellGUI/Makefile.Debug
@@ -0,0 +1,221 @@
#############################################################################
# Makefile for building: OMShell
# Generated by qmake (2.01a) (Qt 4.7.0) on: s� 6. mar 04:02:20 2011
# Project: OMShellGUI.pro
# Template: app
#############################################################################

####### Compiler, tools and options

CC = gcc
CXX = g++
DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -D__x86__ -D__NT__ -D__OSVERSION__=4 -D__WIN32__ -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN
CFLAGS = -g -w $(DEFINES)
CXXFLAGS = -g -w -frtti -fexceptions -mthreads $(DEFINES)
INCPATH = -I"..\..\..\..\Qt\2010.05\qt\include\QtCore" -I"..\..\..\..\Qt\2010.05\qt\include\QtGui" -I"..\..\..\..\Qt\2010.05\qt\include\QtXml" -I"..\..\..\..\Qt\2010.05\qt\include" -I"..\..\..\..\OMDev\lib\omniORB-4.1.4-mingw\include" -I"..\..\..\..\Qt\2010.05\qt\include\ActiveQt" -I"..\generatedfiles\moc" -I"..\..\..\..\Qt\2010.05\qt\mkspecs\win32-g++"
LINK = g++
LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -mthreads -Wl -Wl,-subsystem,windows
LIBS = -L"c:\Qt\2010.05\qt\lib" -lmingw32 -lqtmaind debug\rc_omshell_res.o -LC:\OMDev/lib/omniORB-4.1.4-mingw/lib/x86_win32 -lomniORB414_rt -lomnithread34_rt -lQtXmld4 -lQtGuid4 -lQtCored4
QMAKE = c:\qt\2010.05\qt\bin\qmake.exe
IDC = c:\Qt\2010.05\qt\bin\idc.exe
IDL = midl
ZIP = zip -r -9
DEF_FILE =
RES_FILE = debug\rc_omshell_res.o
COPY = copy /y
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
DEL_FILE = del
DEL_DIR = rmdir
MOVE = move
CHK_DIR_EXISTS= if not exist
MKDIR = mkdir
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)

####### Output directory

OBJECTS_DIR = debug

####### Files

SOURCES = commandcompletion.cpp \
..\..\OMEdit\OMEditGUI\omc_communication.cpp \
omc_communicator.cpp \
omcinteractiveenvironment.cpp \
oms.cpp \
main.cpp ..\generatedfiles\moc\moc_commandcompletion.cpp \
..\generatedfiles\moc\moc_omc_communicator.cpp \
..\generatedfiles\moc\moc_oms.cpp \
..\generatedfiles\rcc\qrc_oms.cpp
OBJECTS = debug/commandcompletion.o \
debug/omc_communication.o \
debug/omc_communicator.o \
debug/omcinteractiveenvironment.o \
debug/oms.o \
debug/main.o \
debug/moc_commandcompletion.o \
debug/moc_omc_communicator.o \
debug/moc_oms.o \
debug/qrc_oms.o
DIST =
QMAKE_TARGET = OMShell
DESTDIR = ..\bin\ #avoid trailing-slash linebreak
TARGET = OMShell.exe
DESTDIR_TARGET = ..\bin\OMShell.exe

####### Implicit rules

.SUFFIXES: .cpp .cc .cxx .c

.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<

.cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<

.cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<

.c.o:
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<

####### Build rules

first: all
all: Makefile.Debug $(DESTDIR_TARGET)

$(DESTDIR_TARGET): $(OBJECTS) debug/rc_omshell_res.o
$(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OMShell.Debug $(LIBS)


debug/rc_omshell_res.o: rc_omshell.rc
windres -i rc_omshell.rc -o debug\rc_omshell_res.o --include-dir=. $(DEFINES)

qmake: FORCE
@$(QMAKE) -spec ..\..\..\..\Qt\2010.05\qt\mkspecs\win32-g++ CONFIG+=release -o Makefile.Debug OMShellGUI.pro

dist:
$(ZIP) OMShell.zip $(SOURCES) $(DIST) OMShellGUI.pro ..\..\..\..\Qt\2010.05\qt\mkspecs\qconfig.pri ..\..\..\..\Qt\2010.05\qt\mkspecs\modules\qt_webkit_version.pri ..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt_functions.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt_config.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\exclusive_builds.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\default_pre.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\default_pre.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\debug.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\debug_and_release.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\default_post.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\default_post.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\build_pass.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\warn_off.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\rtti.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\exceptions.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\stl.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\shared.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\qt.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\thread.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\moc.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\win32\windows.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\resources.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\uic.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\yacc.prf ..\..\..\..\Qt\2010.05\qt\mkspecs\features\lex.prf c:\Qt\2010.05\qt\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES

clean: compiler_clean
-$(DEL_FILE) debug\commandcompletion.o debug\omc_communication.o debug\omc_communicator.o debug\omcinteractiveenvironment.o debug\oms.o debug\main.o debug\moc_commandcompletion.o debug\moc_omc_communicator.o debug\moc_oms.o debug\qrc_oms.o
-$(DEL_FILE) debug\rc_omshell_res.o

distclean: clean
-$(DEL_FILE) $(DESTDIR_TARGET)
-$(DEL_FILE) Makefile.Debug

check: first

mocclean: compiler_moc_header_clean compiler_moc_source_clean

mocables: compiler_moc_header_make_all compiler_moc_source_make_all

compiler_moc_header_make_all: ../generatedfiles/moc/moc_commandcompletion.cpp ../generatedfiles/moc/moc_omc_communicator.cpp ../generatedfiles/moc/moc_oms.cpp
compiler_moc_header_clean:
-$(DEL_FILE) ..\generatedfiles\moc\moc_commandcompletion.cpp ..\generatedfiles\moc\moc_omc_communicator.cpp ..\generatedfiles\moc\moc_oms.cpp
../generatedfiles/moc/moc_commandcompletion.cpp: commandunit.h \
commandcompletion.h
C:\Qt\2010.05\qt\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 commandcompletion.h -o ..\generatedfiles\moc\moc_commandcompletion.cpp

../generatedfiles/moc/moc_omc_communicator.cpp: ../../OMEdit/OMEditGUI/omc_communication.h \
omc_communicator.h
C:\Qt\2010.05\qt\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 omc_communicator.h -o ..\generatedfiles\moc\moc_omc_communicator.cpp

../generatedfiles/moc/moc_oms.cpp: inputcelldelegate.h \
commandcompletion.h \
commandunit.h \
oms.h
C:\Qt\2010.05\qt\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 oms.h -o ..\generatedfiles\moc\moc_oms.cpp

compiler_rcc_make_all: ../generatedfiles/rcc/qrc_oms.cpp
compiler_rcc_clean:
-$(DEL_FILE) ..\generatedfiles\rcc\qrc_oms.cpp
../generatedfiles/rcc/qrc_oms.cpp: oms.qrc \
Resources/cut.bmp \
Resources/help.bmp \
Resources/start.bmp \
Resources/print.bmp \
Resources/omshell-large.svg \
Resources/stop.bmp \
Resources/copy.bmp \
Resources/clear.bmp \
Resources/OMS.ico \
Resources/paste.bmp
c:\Qt\2010.05\qt\bin\rcc.exe -name oms oms.qrc -o ..\generatedfiles\rcc\qrc_oms.cpp

compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
compiler_moc_source_make_all:
compiler_moc_source_clean:
compiler_uic_make_all:
compiler_uic_clean:
compiler_yacc_decl_make_all:
compiler_yacc_decl_clean:
compiler_yacc_impl_make_all:
compiler_yacc_impl_clean:
compiler_lex_make_all:
compiler_lex_clean:
compiler_clean: compiler_moc_header_clean compiler_rcc_clean



####### Compile

debug/commandcompletion.o: commandcompletion.cpp commandcompletion.h \
commandunit.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\commandcompletion.o commandcompletion.cpp

debug/omc_communication.o: ../../OMEdit/OMEditGUI/omc_communication.cpp ../../OMEdit/OMEditGUI/omc_communication.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\omc_communication.o ..\..\OMEdit\OMEditGUI\omc_communication.cpp

debug/omc_communicator.o: omc_communicator.cpp omc_communicator.h \
../../OMEdit/OMEditGUI/omc_communication.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\omc_communicator.o omc_communicator.cpp

debug/omcinteractiveenvironment.o: omcinteractiveenvironment.cpp omcinteractiveenvironment.h \
omc_communicator.h \
../../OMEdit/OMEditGUI/omc_communication.h \
inputcelldelegate.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\omcinteractiveenvironment.o omcinteractiveenvironment.cpp

debug/oms.o: oms.cpp oms.h \
inputcelldelegate.h \
commandcompletion.h \
commandunit.h \
omcinteractiveenvironment.h \
omc_communicator.h \
../../OMEdit/OMEditGUI/omc_communication.h \
otherdlg.h \
ui_OtherDlg.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\oms.o oms.cpp

debug/main.o: main.cpp oms.h \
inputcelldelegate.h \
commandcompletion.h \
commandunit.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\main.o main.cpp

debug/moc_commandcompletion.o: ../generatedfiles/moc/moc_commandcompletion.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_commandcompletion.o ..\generatedfiles\moc\moc_commandcompletion.cpp

debug/moc_omc_communicator.o: ../generatedfiles/moc/moc_omc_communicator.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_omc_communicator.o ..\generatedfiles\moc\moc_omc_communicator.cpp

debug/moc_oms.o: ../generatedfiles/moc/moc_oms.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_oms.o ..\generatedfiles\moc\moc_oms.cpp

debug/qrc_oms.o: ../generatedfiles/rcc/qrc_oms.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\qrc_oms.o ..\generatedfiles\rcc\qrc_oms.cpp

####### Install

install: FORCE

uninstall: FORCE

FORCE:

0 comments on commit 083ec3b

Please sign in to comment.