From 19888d1d684fadb8a957157067ce7fbd0e4b2811 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Wed, 23 Oct 2019 17:41:24 +0300 Subject: [PATCH] [all] Rename Rename web-apps-pro -> web-apps --- .travis.yml | 4 ++-- Makefile | 10 +++++----- build/build-mobile.command | 6 +++--- cell/.unit-tests/FormulaTests.html | 6 +++--- cell/.unit-tests/RunCellFormatTests.html | 6 +++--- cell/.unit-tests/RunTests.html | 6 +++--- cell/.unit-tests/testsForFWB.html | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5202e52272..0ff10c1ec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ node_js: before_script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - echo "Project branch $BRANCH" - - git clone -b develop https://github.com/ONLYOFFICE/web-apps-pro.git ../web-apps-pro - - cd ../web-apps-pro && git checkout -B $BRANCH && cd - + - git clone -b develop https://github.com/ONLYOFFICE/web-apps.git ../web-apps + - cd ../web-apps && git checkout -B $BRANCH && cd - jobs: include: - stage: Check all files contains Copyright diff --git a/Makefile b/Makefile index e904230997..816c38b53b 100644 --- a/Makefile +++ b/Makefile @@ -24,15 +24,15 @@ GRUNT_ENV += BUILD_NUMBER=$(BUILD_NUMBER) GRUNT_ENV += APP_COPYRIGHT="$(APP_COPYRIGHT)" GRUNT_ENV += PUBLISHER_URL="$(PUBLISHER_URL)" -WEBAPPS_DIR := web-apps-pro +WEBAPPS_DIR := web-apps WEBAPPS = $(OUTPUT)/$(WEBAPPS_DIR) NODE_MODULES = build/node_modules ../$(WEBAPPS_DIR)/build/node_modules #PACKAGE_JSON = build/package.json ../$(WEBAPPS_DIR)/build/package.json -WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps-pro/apps/api/documents/api.js -WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps-pro/apps/documenteditor/main/app.js -WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps-pro/apps/presentationeditor/main/app.js -WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps-pro/apps/spreadsheeteditor/main/app.js +WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps/apps/api/documents/api.js +WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps/apps/documenteditor/main/app.js +WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps/apps/presentationeditor/main/app.js +WEBAPPS_FILES += ../$(WEBAPPS_DIR)/deploy/web-apps/apps/spreadsheeteditor/main/app.js SDKJS_FILES += word/sdk-all.js .PHONY: all desktop diff --git a/build/build-mobile.command b/build/build-mobile.command index ffb5a7e01f..6c93bfee2a 100755 --- a/build/build-mobile.command +++ b/build/build-mobile.command @@ -37,18 +37,18 @@ CopyScriptTo() { printf $'\r' > temp.txt echo "Copy: word sdk-all.js" - cat "../../web-apps-pro/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps-pro/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../common/Native/Wrappers/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" + cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../common/Native/Wrappers/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" cat "banners.js" "../word/sdk-all-min.js" "../word/sdk-all.js" > $DOCUMENTS_PATH"/script.bin" rm -f -r "banners.js" echo "Copy: cell sdk-all.js" - cat "../../web-apps-pro/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps-pro/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../cell/native/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" + cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../cell/native/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" cat "banners.js" "../cell/sdk-all-min.js" "../cell/sdk-all.js" > $SPREADSHEETS_PATH"/script.bin" rm -f -r "banners.js" echo "Copy: slide sdk-all.js" - cat "../../web-apps-pro/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps-pro/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../common/Native/Wrappers/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" + cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-apps/vendor/underscore/underscore-min.js" "temp.txt" "../common/Native/native.js" "temp.txt" "../common/Native/Wrappers/common.js" "temp.txt" "../common/Native/jquery_native.js" "temp.txt" > "banners.js" cat "banners.js" "../slide/sdk-all-min.js" "../slide/sdk-all.js" > $PRESENTATIONS_PATH"/script.bin" rm -f -r "banners.js" diff --git a/cell/.unit-tests/FormulaTests.html b/cell/.unit-tests/FormulaTests.html index f77021b139..c11a70268d 100644 --- a/cell/.unit-tests/FormulaTests.html +++ b/cell/.unit-tests/FormulaTests.html @@ -5,13 +5,13 @@ Unit Tests - + - + - + + - + - + + - + - + + - + - +