Skip to content
Snippets Groups Projects
Verified Commit e8055ef6 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-package-release' into 'f-doc-release'

parents 18f005c4 a0edf3bb
No related branches found
No related tags found
No related merge requests found
Pipeline #18901 passed with warnings
Pipeline: caosdb-octaveinttest

#18902

    ...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
    ## Useful tools ## ## Useful tools ##
    * Linter: [`miss_hit`](https://github.com/florianschanda/miss_hit): `pip3 install --user miss_hit` * Linter: [`miss_hit`](https://github.com/florianschanda/miss_hit), install with `pip3 install --user miss_hit`
    * Documentation generation: [`generate_html`](https://gnu-octave.github.io/packages/generate_html), install with
    `pkg install "https://downloads.sourceforge.net/project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases/generate_html-0.3.2.tar.gz"`
    ...@@ -48,3 +48,10 @@ guidelines of the CaosDB Project ...@@ -48,3 +48,10 @@ guidelines of the CaosDB Project
    These steps are necessary for creating the upstream package at Octave's repository: These steps are necessary for creating the upstream package at Octave's repository:
    1. Update Octave-package repository on github.com:
    1. Create new version release:
    1. Set `id`: same as tag
    2. Set `date`: today
    3. Set `url`: Use the asset from the Gitlab release, for example [this url](https://gitlab.indiscale.com/caosdb/src/caosdb-octavelib/-/archive/v0.0.1/caosdb-octavelib-v0.0.1.tar.gz).
    4. Set `sha256`: Download the asset and run `sha256` on it.
    2. Create pull request at https://github.com/gnu-octave/packages .
    doc/img/caosdb_icon.png

    23.5 KiB

    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
    <!-- Created with Inkscape (http://www.inkscape.org/) -->
    <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="49.746155mm"
    height="48.310867mm"
    viewBox="0 0 49.746155 48.310867"
    version="1.1"
    id="svg865"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    sodipodi:docname="caosdb_twitter.svg"
    inkscape:export-filename="/home/salexan/Private/Data/Projects/Planung/management/internal/docs/grafiken.2018-10-23/logo/caosdb_twitter.png"
    inkscape:export-xdpi="300"
    inkscape:export-ydpi="300">
    <defs
    id="defs859" />
    <sodipodi:namedview
    id="base"
    pagecolor="#ffffff"
    bordercolor="#666666"
    borderopacity="1.0"
    inkscape:pageopacity="0.0"
    inkscape:pageshadow="2"
    inkscape:zoom="1.979899"
    inkscape:cx="-80.298915"
    inkscape:cy="-19.036148"
    inkscape:document-units="mm"
    inkscape:current-layer="layer1"
    showgrid="false"
    fit-margin-top="12"
    fit-margin-left="12"
    fit-margin-right="12"
    fit-margin-bottom="12"
    inkscape:window-width="956"
    inkscape:window-height="1029"
    inkscape:window-x="0"
    inkscape:window-y="24"
    inkscape:window-maximized="0" />
    <metadata
    id="metadata862">
    <rdf:RDF>
    <cc:Work
    rdf:about="">
    <dc:format>image/svg+xml</dc:format>
    <dc:type
    rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    <dc:title></dc:title>
    </cc:Work>
    </rdf:RDF>
    </metadata>
    <g
    inkscape:label="Ebene 1"
    inkscape:groupmode="layer"
    id="layer1"
    transform="translate(10.337009,9.9314133)">
    <g
    id="g926"
    transform="matrix(-0.21292621,0,0,0.21296034,31.566187,-20.683624)"
    style="stroke:#0b7983;stroke-width:1.06712019">
    <ellipse
    ry="22.678572"
    rx="45.357143"
    cy="196.18175"
    cx="67.014771"
    id="ellipse917"
    style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0b7983;stroke-width:4.26848078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
    <ellipse
    style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0b7983;stroke-width:4.26848078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    id="ellipse920"
    cx="67.014771"
    cy="176.79443"
    rx="45.357143"
    ry="22.678572" />
    <ellipse
    style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0b7983;stroke-width:4.26848078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    id="ellipse922"
    cx="92.947861"
    cy="156.38371"
    rx="45.357143"
    ry="22.678572" />
    <ellipse
    transform="matrix(0.96812172,-0.25048022,0.25042246,0.96813666,0,0)"
    ry="22.677917"
    rx="45.358452"
    cy="145.95947"
    cx="30.36248"
    id="ellipse924"
    style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0b7983;stroke-width:4.26848078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
    </g>
    </g>
    </svg>
    ...@@ -153,8 +153,7 @@ classdef Entity < handle ...@@ -153,8 +153,7 @@ classdef Entity < handle
    name = prop{1}.name; name = prop{1}.name;
    if isfield(result, name) if isfield(result, name)
    error("caosdb:NameCollision", ... error("caosdb:NameCollision", ...
    ["Name collision: Two or more properties of the same name, " ... "Name collision: Two or more properties of the same name, cannot pack into struct.");
    "cannot pack into struct."]);
    end end
    result = setfield(result, name, prop{1}); result = setfield(result, name, prop{1});
    end end
    ......
    ...@@ -7,6 +7,29 @@ set -e ...@@ -7,6 +7,29 @@ set -e
    ## See https://octave.org/doc/interpreter/Creating-Packages.html ## ## See https://octave.org/doc/interpreter/Creating-Packages.html ##
    ############################################################################### ###############################################################################
    # Print arg1 as an error.
    function error {
    echo -e "\n[EE] $1\n" >&2
    }
    # Check dependencies and spit out user-friendly messages.
    #
    # This function should be called at such a place that the conanfile is in the parent directory.
    function check_deps {
    general_help="Please check the online documentation and installation instructions
    at https://docs.indiscale.com/caosdb-octavelib and
    https://gitlab.com/caosdb/caosdb-octavelib for more information and
    contact options."
    # Is conan installed?
    conan_missing="The build tool \`conan' seems to be missing.\n\n${general_help}"
    conan --version || (error "$conan_missing"; exit 1)
    # Are the dependencies satisfied?
    dependencies_missing="There seem to be missing build dependencies.\n\n${general_help}"
    conan info .. > /dev/null || (error "$dependencies_missing"; exit 1)
    }
    echo "Octave CaosDB SRC_DIR: $PWD" echo "Octave CaosDB SRC_DIR: $PWD"
    # Environment specific settings ############################################### # Environment specific settings ###############################################
    ...@@ -58,6 +81,8 @@ echo "Octave CaosDB BUILD_DIR: $BUILD_DIR" ...@@ -58,6 +81,8 @@ echo "Octave CaosDB BUILD_DIR: $BUILD_DIR"
    mkdir -p $BUILD_DIR mkdir -p $BUILD_DIR
    pushd $BUILD_DIR pushd $BUILD_DIR
    check_deps
    # Install the DEBUG version like this, for example: `DEBUG=1 make install` # Install the DEBUG version like this, for example: `DEBUG=1 make install`
    if [[ "$DEBUG" == 1 ]] ; then if [[ "$DEBUG" == 1 ]] ; then
    BUILD_TYPE=Debug BUILD_TYPE=Debug
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment