Changeset 13295

Timestamp:

2012-10-10T23:43:35+02:00 (12 years ago)

Author:

adeas31

Message:

• build all clients.
• removed OMTools as is not required.
• build instructions.

Location:

trunk

Files:

• Makefile.omdev.mingw (modified) (1 diff)
• OMEdit/OMEditGUI/Makefile.omdev.mingw (modified) (1 diff)
• OMNotebook/OMNotebookGUI/Makefile.omdev.mingw (modified) (1 diff)
• OMOptim/build/Makefile.omdev.mingw (modified) (1 diff)
• OMOptimBasis/build/Makefile.omdev.mingw (modified) (1 diff)
• OMPlot/OMPlotGUI/Makefile.omdev.mingw (modified) (1 diff)
• OMShell/OMShellGUI/Makefile.omdev.mingw (modified) (1 diff)
• OMTools (deleted)
• OMVisualize/OMVisualizeGUI/Makefile.omdev.mingw (modified) (1 diff)
• README-BUILD-RELEASE-NSIS.txt (modified) (1 diff)
• README-OMDev-MINGW.txt (modified) (1 diff)

trunk/Makefile.omdev.mingw

@@ -146 +146 @@
 qtclean:
 
+qtclients:
+  $(MAKE) -C OMPlot/OMPlotGUI -f Makefile.omdev.mingw
+  $(MAKE) -C OMVisualize/OMVisualizeGUI -f Makefile.omdev.mingw
+  $(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw
+  $(MAKE) -C OMNotebook/OMNotebookGUI -f Makefile.omdev.mingw
+  $(MAKE) -C OMShell/OMShellGUI -f Makefile.omdev.mingw
+  $(MAKE) -C OMOptimBasis/build -f Makefile.omdev.mingw
+  $(MAKE) -C OMOptim/build -f Makefile.omdev.mingw
+
+clean-qtclients:
+  rm -f build/bin/OMPlot.exe build/bin/OMVisualize.exe build/bin/OMEdit.exe build/bin/OMNotebook.exe build/bin/OMShell.exe build/bin/OMOptim.exe
+  rm -f build/lib/libOMPlot.a build/lib/libOMVisualize.a build/lib/libOMOptimBasis.a build/lib/libOMOptim.a
+  rm -rf build/share/omedit* build/share/omnotebook* build/share/omshell*
+  rm -rf build/share/doc/omedit* build/share/doc/omoptim*
+  $(MAKE) -C OMPlot/OMPlotGUI -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMVisualize/OMVisualizeGUI -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMNotebook/OMNotebookGUI -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMShell/OMShellGUI -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMOptimBasis/build -f Makefile.omdev.mingw clean
+  $(MAKE) -C OMOptim/build -f Makefile.omdev.mingw clean
+
 .PRECIOUS: Makefile.omdev.mingw

trunk/OMEdit/OMEditGUI/Makefile.omdev.mingw

@@ -33 +33 @@
 clean:
   test ! -f Makefile || $(MAKE) -f Makefile clean
-  rm -rf ../bin/$(NAME)$(EXE) omc_communication.*
+  rm -rf ../bin/$(NAME)$(EXE) omc_communication.* Makefile Makefile.Debug Makefile.Release object_script.*
 
 build: $(NAME)

trunk/OMNotebook/OMNotebookGUI/Makefile.omdev.mingw

@@ -14 +14 @@
 clean: Makefile
   test ! -f Makefile || $(MAKE) -f Makefile clean
-  rm -rf ../bin/$(NAME)$(EXE) omc_communication.*
+  rm -rf ../bin/$(NAME)$(EXE) omc_communication.* Makefile Makefile.Debug Makefile.Release object_script.*
 
 omc_communication.cc: $(runtimedir)/omc_communication.idl

trunk/OMOptim/build/Makefile.omdev.mingw

@@ -39 +39 @@
   test ! -f Makefile || $(MAKE) -f Makefile clean
   test ! -f MakefileLib || $(MAKE) -f MakefileLib clean
-  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE)
+  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE) Makefile Makefile.Debug Makefile.Release MakefileLib MakefileLib.Debug MakefileLib.Release object_script.*

trunk/OMOptimBasis/build/Makefile.omdev.mingw

@@ -24 +24 @@
 clean:
   test ! -f Makefile || $(MAKE) -f Makefile clean
-  rm -rf ../bin/$(LIB)$(LIBEXE)
+  rm -rf ../bin/$(LIB)$(LIBEXE) Makefile Makefile.Debug Makefile.Release object_script.*

trunk/OMPlot/OMPlotGUI/Makefile.omdev.mingw

@@ -24 +24 @@
   test ! -f Makefile || $(MAKE) -f Makefile clean
   test ! -f Makefile.lib || $(MAKE) -f Makefile.lib clean
-  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE)
+  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE) Makefile Makefile.Debug Makefile.Release Makefile.lib Makefile.lib.Debug Makefile.lib.Release object_script.*
 
 $(NAME): Makefile $(LIB)

trunk/OMShell/OMShellGUI/Makefile.omdev.mingw

@@ -17 +17 @@
 clean: Makefile
   test ! -f Makefile || $(MAKE) -f Makefile clean
-  rm -rf ../bin/$(NAME)$(EXE) omc_communication.*
+  rm -rf ../bin/$(NAME)$(EXE) omc_communication.* Makefile Makefile.Debug Makefile.Release object_script.*
 
 omc_communication.cc: $(runtimedir)/omc_communication.idl

trunk/OMVisualize/OMVisualizeGUI/Makefile.omdev.mingw

@@ -24 +24 @@
   test ! -f Makefile || $(MAKE) -f Makefile clean
   test ! -f Makefile.lib || $(MAKE) -f Makefile.lib clean
-  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE)
+  rm -rf ../bin/$(LIB)$(LIBEXE) ../bin/$(NAME)$(EXE) Makefile Makefile.Debug Makefile.Release Makefile.lib Makefile.lib.Debug Makefile.lib.Release object_script.*
 
 $(NAME): Makefile $(LIB)

trunk/README-BUILD-RELEASE-NSIS.txt

@@ -41 +41 @@
     - make -f Makefile.omdev.mingw install-python OR Ctrl+B and type: install-python
 
-    - build OMClients i.e OMEdit, OMShell, OMNotebook, OMPlot, OMOptim, OMVisualize using Qt SDK. Follow the README.txt of each OMClient. Use the makefiles (recommended).
+    - build OMClients i.e OMEdit, OMShell, OMNotebook, OMPlot, OMOptim, OMVisualize using Qt SDK.
+    - make -f Makefile.omdev.mingw qtclients OR Ctrl+B and type: clean-qtclients qtclients
+    - You must download and install QtSDK 4.8.0. Add Qt in your PATH.
+    
     - add any new dll needed by clients into $OMDev\tools\OMTools\dll
     - if a new language file is added to OMEdit then add the corresponding qt language file into $OMDev\tools\OMTools\nls

trunk/README-OMDev-MINGW.txt

@@ -96 +96 @@
     - Ctrl+B and type: install-python
       Generates the python stub files.
-      Copy the OMPython files in trunk\build\share\omc\scripts\PythonInterface
+      Copies the OMPython files in trunk\build\share\omc\scripts\PythonInterface
+      
+14. To build the OpenModelica clients:
+    - Ctrl+B and type: qtclients
+      Compiles OMNotebook, OMShell, OMEdit, OMPlot, OMVisualize, OMOptim
+      Copies the binaries in trunk\build\bin and libraries in trunk\build\lib
 
 ***NOTES*** ON PROBLEMS WITH THE ECLIPSE PROJECT/OMDev BUILDER: