Commit 32bec503 authored by Volker Schukai's avatar Volker Schukai 🥊
Browse files

Merge branch 'MONSTER/-/4c648cd8-cce8-4a85-a16a-64daf486b04a' into 'master'

Next Release

See merge request oss/libraries/javascript/monster!42
parents f077f3dd e3e0250f
......@@ -11,7 +11,7 @@ stages:
test:
stage: test
script:
- apt update && apt install -y jq gawk plantuml
- apt-get update && apt-get install -y jq gawk plantuml
- make test
......
......@@ -2,9 +2,12 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/../../../../alvine/frontend/console/alvine.console/alvine.console.iml" filepath="$PROJECT_DIR$/../../../../alvine/frontend/console/alvine.console/alvine.console.iml" />
<module fileurl="file://$PROJECT_DIR$/../web-components/form/form.iml" filepath="$PROJECT_DIR$/../web-components/form/form.iml" />
<module fileurl="file://$PROJECT_DIR$/monster.iml" filepath="$PROJECT_DIR$/monster.iml" />
<module fileurl="file://$PROJECT_DIR$/../web-components/multiselect/web-components.multiselect.iml" filepath="$PROJECT_DIR$/../web-components/multiselect/web-components.multiselect.iml" />
<module fileurl="file://$PROJECT_DIR$/../web-components/notify/notify.iml" filepath="$PROJECT_DIR$/../web-components/notify/notify.iml" />
<module fileurl="file://$PROJECT_DIR$/../web-components/template/template.iml" filepath="$PROJECT_DIR$/../web-components/template/template.iml" />
<module fileurl="file://$PROJECT_DIR$/../web-components/treemenu/treemenu.iml" filepath="$PROJECT_DIR$/../web-components/treemenu/treemenu.iml" />
</modules>
</component>
</project>
\ No newline at end of file
......@@ -236,6 +236,8 @@ JSDOC := $(NODE_MODULES_BIN_DIR)jsdoc
$(NODE_MODULES_DIR): $(THIS_DIR)package.json
$(QUIET) $(NPM) install
$(QUIET) $(NODE) $(THIS_DIR)node_modules/jsdoc-plantuml/fixBrokenNodeJS.js
$(QUIET) $(RM) node_modules/.modified
$(QUIET) $(TOUCH) -m node_modules/.modified
#############################################################################################
## UNTILITIES ###############################################################################
......@@ -290,13 +292,13 @@ $(MONSTER_DIST_DIR):
$(MONSTER_BUILD_TEST_BROWSER_DIR)node_modules/: $(MONSTER_BUILD_TEST_BROWSER_DIR)/package.json
$(QUIET) $(CD) $(MONSTER_BUILD_TEST_BROWSER_DIR) ; $(NPM) install ; cd -
$(QUIET) $(CD) $(MONSTER_BUILD_TEST_BROWSER_DIR) ; $(NPM) install ; $(RM) node_modules/.modified ; $(TOUCH) -m node_modules/.modified; cd -
$(MONSTER_BUILD_LIB_DIR)node_modules/: $(MONSTER_BUILD_LIB_DIR)/package.json
$(QUIET) $(CD) $(MONSTER_BUILD_LIB_DIR) ; $(NPM) install ; cd -
$(QUIET) $(CD) $(MONSTER_BUILD_LIB_DIR) ; $(NPM) install ; $(RM) node_modules/.modified ; $(TOUCH) -m node_modules/.modified; cd -
$(MONSTER_BUILD_LIB_DEV_DIR)node_modules/: $(MONSTER_BUILD_LIB_DEV_DIR)/package.json
$(QUIET) $(CD) $(MONSTER_BUILD_LIB_DEV_DIR) ; $(NPM) install ; cd -
$(QUIET) $(CD) $(MONSTER_BUILD_LIB_DEV_DIR) ; $(NPM) install ; $(RM) node_modules/.modified ; $(TOUCH) -m node_modules/.modified; cd -
.PHONY: version-monster
version-monster: $(MONSTER_TEST_CASE_DIR)monster.js $(MONSTER_SOURCE_DIR)/types/version.js $(MONSTER_DIR)README.md $(MONSTER_FILES_WITHVERSION) $(MONSTER_TUTORIALS_FILES_WITHVERSION)
......@@ -345,7 +347,7 @@ test-browser-monster: $(MONSTER_BUILD_TEST_BROWSER_DIR)node_modules/ create-poly
$(QUIET) $(SED) -i -E "/id=\"lastupdate\"/s_.*_ <div id=\"lastupdate\" style='font-size:0.7em'>last update $(shell date)</div>_" $(MONSTER_TEST_DIR)web/test.html $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) $(SED) -i -E "s_src=\"([\"]*)\.js.*\"_src=\"\1.js?r=$(shell date +"%T")\"_" $(MONSTER_TEST_DIR)web/test.html $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) $(SED) -i -E "s_dist/([0-9]+\.[0-9]+\.[0-9]+)*/dist/monster_dist/$(MONSTER_CORE_VERSION)/dist/monster_" $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) if $(OPENBROWSER) ; then google-chrome --profile-directory="Default" $(MONSTER_TEST_DIR)web/test.html ; fi
#$(QUIET) if $(OPENBROWSER) ; then google-chrome --profile-directory="Default" $(MONSTER_TEST_DIR)web/test.html ; fi
.PHONY: test-monster
## test library
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment