diff --git a/README.md b/README.md index b1e87a6da7717a33addb960666b30cb1adce36ee..25e736f81f7738a217e8b01bca717108a4ec6e22 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,7 @@ The digital edition of Webers Freischütz was developed by the project "[Freisch ## Get started -Edirom Online is a web application written in XQuery and JavaScript, and designed for deployment in [eXist-db]. -Please be aware, the software is still under high development and has to be seen as beta software. +Edirom Online is a web application written in XQuery and JavaScript, and designed for deployment in [eXist-db]. ### Cloning this repository @@ -106,7 +105,7 @@ When you have your system prepared with all Sencha Cmd prerequisites or you have * Login with "admin:[empty]" * build and deploy **xar of Edirom** * also see [building Edirom locally] above - * at `http://localhost:8080/exist/apps/dashboard/admin#` (signed-in) go to "Package Manager" then "Upload" and select the xar file which (supposed above build-method was used) was built at `/PATH_TO_LOCAL_EDIROM_REPO/build-xar/Edirom-Online-1.0.0-beta.5-[TIMESTAMP].xar` + * at `http://localhost:8080/exist/apps/dashboard/admin#` (signed-in) go to "Package Manager" then "Upload" and select the xar file which (supposed above build-method was used) was built at `/PATH_TO_LOCAL_EDIROM_REPO/build-xar/Edirom-Online-1.0.0-[TIMESTAMP].xar` * build **xar of sample data** for deploying at exist-db * also see [building sample data] * at `http://localhost:8080/exist/apps/dashboard/admin#` (signed-in) go to "Package Manager" then "Upload" and select the xar file which (supposed above build-method was used) was built at `/PATH_TO_LOCAL_EDIROM_EDITION_EXAMPLE_REPO/build/EditionExample-0.1.xar` diff --git a/build.xml b/build.xml index e6f13782d983fb1df25afc8232e2d042a102e33b..58683cc50a707a6e6768d37d8423deabdf723835 100755 --- a/build.xml +++ b/build.xml @@ -4,7 +4,7 @@ <import file="${basedir}/.sencha/app/build-impl.xml"/> <import file="${basedir}/testing/ant-tests.xml"/> - <property name="project.version" value="1.0.0-beta.7"/> + <property name="project.version" value="1.0.0"/> <property name="project.app" value="Edirom-Online"/> <property name="project.title" value="Edirom Online"/> <property name="repo.target" value="${project.app}"/> diff --git a/docs/release-workflow.md b/docs/release-workflow.md index 9c6576f4ca7f6fc29ba4feb5efd87b27786660b0..2f633d1bbeeb4b2a37b4be1e318666cce5814a12 100644 --- a/docs/release-workflow.md +++ b/docs/release-workflow.md @@ -2,22 +2,22 @@ - `git checkout develop` - have a look into release-milestone and manage last issues and PRs -- `git checkout -b rel/1.0.0-beta.[X] develop` +- `git checkout -b rel/1.0.0 develop` - bump version in build.xml - commit version release branch - build `.xar` and test it. - `git checkout main` -- `git merge --no-ff rel/1.0.0-beta.[X]` (release branch into main) +- `git merge --no-ff rel/1.0.0` (release branch into main) - propably resolve merge conflicts and `git continue merge`(?) - `git tag` returns a list of all tags -- `git tag -a v1.0.0-beta.[X] -m "v1.0.0-beta.[X]"` +- `git tag -a v1.0.0 -m "v1.0.0"` - probably `git tag` for review - `git push --follow-tags` - on github.com: Go to tag and klick `Release from Tag` - auto-generate the release description -- upload the tested `Edirom-Online-1.0.0-beta.[X].xar` (asset) +- upload the tested `Edirom-Online-1.0.0.xar` (asset) - publish the release on Github - `git checkout develop` -- `git merge --no-ff rel/1.0.0-beta.[X]` (release branch into develop) +- `git merge --no-ff rel/1.0.0` (release branch into develop) first version of this file was written by @riedde, 22.12.2022 (wiki) diff --git a/docs/setup.md b/docs/setup.md index 57001937af40aa80333bf31eda9d73c834bc2cec..4f76e94823bcf4ea412f728f73c6b4e228d9719c 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -36,7 +36,7 @@ If you want to customize it, you need to build it and create a xar-package by yo root@d5f2f1591708:/app# ``` - the Edirom Online-package is built, we can leave docker-container: `exit` - - the directory `build-xar/` was created inside the Edirom-Online repository and contains the built xar-file of Edirom Online: `Edirom-Online-1.0.0-beta.6-20240926-1521.xar` (version and date-strings will vary) + - the directory `build-xar/` was created inside the Edirom-Online repository and contains the built xar-file of Edirom Online: `Edirom-Online-1.0.0-20250213-1739.xar` (version and date-strings will vary) - navigate back to the edirom-base-directory: `cd ..` ## Build data package @@ -77,7 +77,7 @@ Also at this step we can use a docker image, instead of downloading exist on our ``` - you might also want to save that password, because it wont be shown elsewhere - go to "Package Manager" in the menu on the left and upload the two previously generated xar-packages - - `Edirom-Online-1.0.0-beta.6-20240927-0804.xar` + - `Edirom-Online-1.0.0-2025213-1739.xar` (version and date-string varies) - `EditionExample-0.1.xar` - once the upload is finished, the edirom will be available here: [`http://localhost:8080/exist/apps/Edirom-Online/index.html`](http://localhost:8080/exist/apps/Edirom-Online/index.html) (if not, a reload of the browser window may help) - you can stop the docker container with `^+C` (Mac) or `CTRL+C` (Windows and Linux) or force-stop it by closing the terminal