Ignore:
Timestamp:
May 5, 2017 12:50:52 PM (3 years ago)
Author:
Zimon Kuhs
Message:

Merged r9838, r9843, r9847, r9850 and r9852 to 2.0.x release branch. Ticket #5350 and #5353

Location:
branches/2.0.x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.x

  • branches/2.0.x/Makefile.am

    r9819 r9854  
    282282JAVA_EXEC_CP=$(JAVA_BUILD_DIR)/bin/ModelicaCompiler.jar:$(JAVA_BUILD_DIR)/bin/util.jar:$(abs_top_srcdir)/ThirdParty/Beaver/beaver-0.9.6.1/lib/beaver-rt.jar
    283283
    284 all-local: build-python-packages build-compiler prepare-doc-src
     284all-local: build-python-packages build-compiler
    285285    $(abs_top_srcdir)/get_version.sh $(abs_top_srcdir) https://svn.jmodelica.org > $(abs_builddir)/version.txt
    286286    if [ "$(BUILD_EXTRA)" ]; then exec "$(BUILD_EXTRA)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
     
    295295    java -cp "$(JAVA_EXEC_CP)" org.jmodelica.modelica.compiler.ModelicaCompiler\$$OptionExporter -x "$(abs_builddir)/DefaultOptions.xml"
    296296endif
    297 
    298 # Paths for doc
    299 DOC_BUILD_DIR=$(abs_builddir)/docbook/UsersGuide
    300 DOC_SRC_DIR=$(abs_top_srcdir)/docbook/UsersGuide
    301 
    302 prepare-doc-src: build-compiler
    303     mkdir -p "$(DOC_BUILD_DIR)"
    304     cp -rT "$(DOC_SRC_DIR)" "$(DOC_BUILD_DIR)"
    305     rm "$(DOC_BUILD_DIR)/Options.xml" "$(DOC_BUILD_DIR)/JModelicaUsersGuide.pdf"
    306     java -cp "$(JAVA_EXEC_CP)" org.jmodelica.modelica.compiler.ModelicaCompiler\$$OptionExporter -t "$(DOC_SRC_DIR)/Options.xml" -d "$(DOC_BUILD_DIR)/Options.xml"
    307297
    308298install-exec-local: install-python-packages
Note: See TracChangeset for help on using the changeset viewer.