diff --git a/admin/release b/admin/release index ea923ff3ea..d14167f050 100755 --- a/admin/release +++ b/admin/release @@ -89,9 +89,7 @@ if [ -d dist ]; then fi mkdir dist -setup_repo framework setup_repo userguide -setup_repo appstarter #--------------------------------------------------- # Housekeeping - make sure writable is flushed of test files @@ -139,9 +137,7 @@ git commit -S -m "Release ${RELEASE}" #--------------------------------------------------- # Build the distributables -. admin/release-framework . admin/release-userguide -. admin/release-appstarter #--------------------------------------------------- # Done for now diff --git a/admin/release-appstarter b/admin/release-appstarter deleted file mode 100644 index cd8d4e890e..0000000000 --- a/admin/release-appstarter +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -## Build app starter distributable - -# Setup variables -. admin/release-config -TARGET=dist/appstarter -cd $TARGET -git checkout $branch - -#--------------------------------------------------- -echo -e "${BOLD}Build the framework distributable${NORMAL}" - -echo -e "${BOLD}Copy the main files/folders...${NORMAL}" -releasable='app public writable README.md contributing.md env license.txt spark .gitignore' -for fff in $releasable ; do - if [ -d "$fff" ] ; then - rm -rf $fff - fi - cp -rf ${CI_DIR}/$fff . -done - -rm -rf tests -mkdir tests -cp -rf ${CI_DIR}/tests/_support tests/ - -echo -e "${BOLD}Override as needed...${NORMAL}" -cp -rf ${CI_DIR}/admin/starter/* . - -#--------------------------------------------------- -# And finally, get ready for merging -echo -e "${BOLD}Assemble the pieces...${NORMAL}" -git add . -git commit -S -m "Release ${RELEASE}" -git checkout master -git merge $branch - -cd $CI_DIR - -#--------------------------------------------------- -# Done for now -echo -e "${BOLD}Distributable app starter ready..${NORMAL}" diff --git a/admin/release-deploy b/admin/release-deploy index d7bb66f7c0..fe70284024 100755 --- a/admin/release-deploy +++ b/admin/release-deploy @@ -23,14 +23,6 @@ echo -e "${BOLD}Pushing to the user guide repository${NORMAL}" cd ${CI_DIR}/dist/userguide git push origin master -echo -e "${BOLD}Pushing to the framework repository${NORMAL}" -cd ${CI_DIR}/dist/framework -git push origin master - -echo -e "${BOLD}Pushing to the app starter repository${NORMAL}" -cd ${CI_DIR}/dist/appstarter -git push origin master - cd ${CI_DIR} #--------------------------------------------------- diff --git a/admin/release-framework b/admin/release-framework deleted file mode 100644 index 593b6582bd..0000000000 --- a/admin/release-framework +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -## Build framework distributable - -# Setup variables -. admin/release-config -TARGET=dist/framework -cd $TARGET -git checkout $branch - -#--------------------------------------------------- -echo -e "${BOLD}Build the framework distributable${NORMAL}" - -echo -e "${BOLD}Copy the main files/folders...${NORMAL}" -releasable='app docs public system writable contributing.md env license.txt spark .gitignore' -for fff in $releasable ; do - if [ -d "$fff" ] ; then - rm -rf $fff - fi - cp -rf ${CI_DIR}/$fff . -done - -echo -e "${BOLD}Override as needed...${NORMAL}" -cprm -rf tests -mkdir tests -cp -rf ${CI_DIR}/tests/_support tests/ - -cp -rf ${CI_DIR}/admin/framework/* . - -#--------------------------------------------------- -# And finally, get ready for merging -echo -e "${BOLD}Assemble the pieces...${NORMAL}" -git add . -git commit -S -m "Release ${RELEASE}" -git checkout master -git merge $branch - -cd $CI_DIR - -#--------------------------------------------------- -# Done for now -echo -e "${BOLD}Distributable framework ready..${NORMAL}"