Changeset 6744a8e in OpenModelica

Timestamp:

2023-03-29T09:25:34+02:00 (13 months ago)

Author:

Martin Sjölund <martin.sjolund@…>

Children:

bf862381

Parents:

0273588

git-author:

Martin Sjölund <martin.sjolund@…> (12/21/21 16:16:26)

git-committer:

Martin Sjölund <martin.sjolund@…> (03/29/23 09:25:34)

Message:

Build the source tarball in Jenkins, including docs

TODO:

• Also upload the source tarball from here (instead of other jobs).
• Install the documentation if it exists

Files:

• Jenkinsfile (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• common/m4/semver.m4 (modified) (1 diff)
• common/semver.sh (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/Makefile (modified) (3 diffs)

Jenkinsfile

@@ -531 +531 @@
             archiveArtifacts "OpenModelicaUsersGuide-${common.tagName()}*.*"
             stash name: 'usersguide', includes: "OpenModelicaUsersGuide-${common.tagName()}*.*"
+
+            sh "make -C doc"
+            stash name: 'doc-tarball', includes: "doc/openmodelica-doc_*.orig.tar.xz"
           }
         }
@@ -794 +797 @@
             sh "mv OpenModelicaUsersGuide ${common.tagName()}"
             sshPublisher(publishers: [sshPublisherDesc(configName: 'OpenModelicaUsersGuide', transfers: [sshTransfer(sourceFiles: "OpenModelicaUsersGuide-${common.tagName()}*,${common.tagName()}/**")])])
+          }
+        }
+        stage('make-source-tarball') {
+          agent {
+            docker {
+              image 'docker.openmodelica.org/build-deps:v1.16.3'
+              label 'linux'
+              alwaysPull true
+            }
+          }
+          steps {
+            echo "${env.NODE_NAME}"
+            unstash 'doc-tarball'
+            sh "make source-dist"
+            stash name: 'source-dist', includes: "openmodelica_*.orig.tar.xz"
           }
         }

Makefile.in

@@ -206 +206 @@
 configure: configure.ac
   autoconf
+
+SOURCE_DIR=openmodelica_@SOURCE_REVISION_NO_PKG@
+source-dist:
+  rm -rf "$(SOURCE_DIR)"
+  mkdir -p "$(SOURCE_DIR)"
+  git ls-files --recurse-submodules | tar caf - -T- | tar xC "$(SOURCE_DIR)"
+  echo "@SOURCE_REVISION_NO_PKG@" > "$(SOURCE_DIR)/REVISION"
+  echo "OMEdit @SOURCE_REVISION_NO_PKG@" > "$(SOURCE_DIR)/OMEdit/REVISION"
+  rm -rf "$(SOURCE_DIR)/testsuite" "$(SOURCE_DIR)/libraries" "$(SOURCE_DIR)/doc" "$(SOURCE_DIR)/OMOptim" "$(SOURCE_DIR)/OMSimulator/OMTLMSimulator/CompositeModels" "$(SOURCE_DIR)/OMSimulator/testsuite"
+  mkdir -p "$(SOURCE_DIR)/doc"
+  tar xCJf "$(SOURCE_DIR)/doc" doc/openmodelica-doc_@SOURCE_REVISION_NO_PKG@.orig.tar.xz
+  tar cJf "$(SOURCE_DIR).orig.tar.xz" "$(SOURCE_DIR)"

common/m4/semver.m4

@@ -3 +3 @@
 AC_MSG_CHECKING([for revision])
 SOURCE_REVISION=`$ac_pwd/common/semver.sh $PACKAGE_NAME`
+SOURCE_REVISION_NO_PKG=`$ac_pwd/common/semver.sh`
 AC_MSG_RESULT([$SOURCE_REVISION])
 

common/semver.sh

@@ -7 +7 @@
   SOURCE_REVISION="OpenModelica `test -f ../REVISION && head -n1 ../REVISION`"
 elif test -z "$SOURCE_REVISION"; then
-  DESCRIBE_SHORT=`git describe --match "v[0-9]*.[0-9]*.[0-9]*" --always`
-  DESCRIBE_LONG=`git describe --match "v[0-9]*.[0-9]*.[0-9]*" --always --long`
+  DESCRIBE_SHORT=`git describe --abbrev=7 --match "v[0-9]*.[0-9]*.[0-9]*" --always`
+  DESCRIBE_LONG=`git describe --abbrev=7 --match "v[0-9]*.[0-9]*.[0-9]*" --always --long`
   if test "$DESCRIBE_SHORT" != "$DESCRIBE_LONG"; then
     SOURCE_REVISION="$DESCRIBE_SHORT"

configure.ac

@@ -27 +27 @@
   OMC_TARGET=
   AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(SOURCE_REVISION_NO_PKG)
+m4_include([common/m4/semver.m4])
+SOURCE_REVISION_NO_PKG=`echo $SOURCE_REVISION_NO_PKG | tr - '~' | sed s/^v//`
+
+AC_SUBST(OMLIBRARY_TARGET)
+AC_ARG_WITH(omlibrary,  [  --with-omlibrary=[core,all,no]       (which libraries to build; default is core; the libraries used by the testsuite)],[OMLIBRARY_TARGET="$withval"],[OMLIBRARY_TARGET="core"])
+
+AC_MSG_CHECKING([for omlibrary target])
+case "$OMLIBRARY_TARGET" in
+  "yes"|"core")
+    OMLIBRARY_TARGET="omlibrary-core"
+    AC_MSG_RESULT([core])
+  ;;
+  "no")
+    OMLIBRARY_TARGET=""
+    AC_MSG_RESULT([none])
+  ;;
+  "all")
+    OMLIBRARY_TARGET="omlibrary-all"
+    AC_MSG_RESULT([all])
+  ;;
+  *)
+    AC_MSG_ERROR("unknown omlibrary target $OMLIBRARY_TARGET")
+  ;;
+esac
+
+if test ! -z "$OMLIBRARY_TARGET"; then
+  AC_MSG_CHECKING([for libraries directory])
+  if test -f libraries/Makefile; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_ERROR([no])
+  fi
 fi
 

doc/Makefile

@@ -1 +1 @@
 .PHONY: generated_pdfs/dyOptInitialGuess.pdf generated_pdfs/cruntimedraft.pdf usersguide cppruntime-doc clean
-all: generated_pdfs/dyOptInitialGuess.pdf
+all: docs
 
 generated_pdfs/cruntimedraft.pdf:
@@ -15 +15 @@
 
 omsiruntime-doc:
-  mkdir -p SimulationRuntime/omsi/Images
+  mkdir -p SimulationRuntime/OMSI/Images
   cp images/logo.svg SimulationRuntime/OMSI/Images/OMLogo.svg
   cd SimulationRuntime/OMSI && cmake -G "Unix Makefiles" -DSOURCE_ROOT=../../../OMCompiler/SimulationRuntime/OMSI && make Docs
@@ -45 +45 @@
 docs:
   test -f ../common/semver.sh
-  $(MAKE) docs-internal BUILDDIR_VER="`cd ../ && ./common/semver.sh | sed -e 's/-dev[.]/~dev-/' -e 's/^v//'`"
+  $(MAKE) docs-internal BUILDDIR_VER="`cd ../ && ./common/semver.sh | tr - "~" | sed -e 's/^v//'`"
 
 clean: