Skip to content

Commit

Permalink
- added changes to main makefile
Browse files Browse the repository at this point in the history
- removed a useless comment in CMakeLists
  • Loading branch information
Marcus Walther committed Aug 6, 2015
1 parent 868a1c3 commit 38d2767
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
25 changes: 23 additions & 2 deletions Makefile
@@ -1,15 +1,32 @@
.PHONY: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft.pdf usersguide
.PHONY: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft.pdf usersguide cppruntime-doc clean
all: generated_pdfs/dyOptInitialGuess.pdf

generated_pdfs/cruntimedraft.pdf:
latexmk -outdir=generated_pdfs -pdf SimulationRuntime/c/src/cruntimedraft.tex

generated_pdfs/dyOptInitialGuess.pdf:
latexmk -outdir=generated_pdfs -pdf SimulationRuntime/DynamicOptimization/src/dyOptInitialGuess.tex

usersguide:
$(MAKE) -C UsersGuide html
@# OMPython sucks at cleaning up...
@killall omc >/dev/null 2>&1
BUILDDIR=openmodelica-doc_$(BUILDDIR_VER)
docs-internal: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft.pdf usersguide

cppruntime-doc:
cp images/logo.svg SimulationRuntime/cpp/Images/OMLogo.svg
cd SimulationRuntime/cpp && cmake -DSOURCE_ROOT=../../../OMCompiler/SimulationRuntime/cpp && make Docs

cppruntime-doc-clean:
rm SimulationRuntime/cpp/Makefile -f
rm SimulationRuntime/cpp/CMakeCache.txt -f
rm SimulationRuntime/cpp/cmake_install.cmake -f
rm SimulationRuntime/cpp/CppRuntimeDoc.config -f
rm SimulationRuntime/cpp/CMakeFiles -rf
rm SimulationRuntime/cpp/Doc -rf
rm SimulationRuntime/cpp/Images/OMLogo.svg -f

docs-internal: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft.pdf usersguide cppruntime-doc
@test ! -z "$(BUILDDIR_VER)" || (echo Call docs, not docs-internal directly; false)
@test ! -z "$(BUILDDIR)"
rm -rf ./$(BUILDDIR)
Expand All @@ -18,6 +35,10 @@ docs-internal: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft
cp ModelicaTutorialFritzson.pdf "./$(BUILDDIR)/"
cp -a UsersGuide/build/html/* "./$(BUILDDIR)/OpenModelicaUsersGuide"
tar cJf "$(BUILDDIR).orig.tar.xz" "./$(BUILDDIR)"

docs:
test -f ../common/semver.sh
$(MAKE) docs-internal BUILDDIR_VER="`cd ../ && ./common/semver.sh | sed -e 's/-dev[.]/~dev-/' -e 's/^v//'`"

clean:

2 changes: 0 additions & 2 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -48,5 +48,3 @@ add_custom_target (Docs ALL
WORKING_DIRECTORY ${TARGET_PATH}
COMMENT "Generating API documentation with Doxygen" VERBATIM
)
# IF you do NOT want the documentation to be generated EVERY time you build the project
# then leave out the 'ALL' keyword from the above command.

0 comments on commit 38d2767

Please sign in to comment.