status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop scripts/copy-translations.sh as useless 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-05-06 16:30:42 +02:00
parent 54b3507d1a
commit a96b35996f
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
13 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -165,20 +165,17 @@ release-ios: export BUILD_ENV ?= prod
release-ios: watchman-clean ##@build build release for iOS release release-ios: watchman-clean ##@build build release for iOS release
@git clean -dxf -f target/ios && \ @git clean -dxf -f target/ios && \
$(MAKE) jsbundle-ios && \ $(MAKE) jsbundle-ios && \
scripts/copy-translations.sh && \
xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive
release-desktop: export TARGET ?= $(HOST_OS) release-desktop: export TARGET ?= $(HOST_OS)
release-desktop: ##@build build release for desktop release based on TARGET release-desktop: ##@build build release for desktop release based on TARGET
@$(MAKE) jsbundle-desktop && \ @$(MAKE) jsbundle-desktop && \
scripts/copy-translations.sh && \
scripts/build-desktop.sh; \ scripts/build-desktop.sh; \
$(MAKE) watchman-clean $(MAKE) watchman-clean
release-windows-desktop: export TARGET ?= windows release-windows-desktop: export TARGET ?= windows
release-windows-desktop: ##@build build release for windows desktop release release-windows-desktop: ##@build build release for windows desktop release
@$(MAKE) jsbundle-desktop && \ @$(MAKE) jsbundle-desktop && \
scripts/copy-translations.sh && \
scripts/build-desktop.sh; \ scripts/build-desktop.sh; \
$(MAKE) watchman-clean $(MAKE) watchman-clean

2
ci/Jenkinsfile.android
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/Jenkinsfile.combined
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/Jenkinsfile.ios
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'macos-xcode-11.4.1' } agent { label 'macos-xcode-11.4.1' }

2
ci/Jenkinsfile.linux
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/Jenkinsfile.macos
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'macos-xcode-11.4.1' } agent { label 'macos-xcode-11.4.1' }

2
ci/Jenkinsfile.nix-cache
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label params.AGENT_LABEL } agent { label params.AGENT_LABEL }

2
ci/Jenkinsfile.windows
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.4' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/tools/Jenkinsfile.fastlane-clean
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.1' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'macos' } agent { label 'macos' }

2
ci/tools/Jenkinsfile.playstore-meta
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.1' library 'status-react-jenkins@v1.1.5'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

3
nix/mobile/android/maven-and-npm-deps/default.nix
View File

@ -39,7 +39,7 @@ let
lib.mkFilter { lib.mkFilter {
root = path; root = path;
include = [ include = [
"android/.*" "translations/.*" "status-modules/.*" "android/.*" "status-modules/.*"
"resources/.*" "mobile/js_files/.*" ".babelrc" "resources/.*" "mobile/js_files/.*" ".babelrc"
]; ];
exclude = [ exclude = [
@ -80,7 +80,6 @@ let
chmod -R u+w ${projectBuildDir} chmod -R u+w ${projectBuildDir}
cp -R ${projectBuildDir}/status-modules/ ${projectBuildDir}/node_modules/status-modules/ cp -R ${projectBuildDir}/status-modules/ ${projectBuildDir}/node_modules/status-modules/
cp -R ${projectBuildDir}/translations/ ${projectBuildDir}/node_modules/status-modules/translations/
# Set up symlinks to mobile enviroment in project root # Set up symlinks to mobile enviroment in project root
${createMobileFilesSymlinks projectBuildDir} ${createMobileFilesSymlinks projectBuildDir}

23
scripts/copy-translations.sh
View File

@ -1,23 +0,0 @@
#!/usr/bin/env bash
set -e
use_chmod="$1"
GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
if [ ! -d "${GIT_ROOT}/node_modules" ]; then
echo "node_modules directory is missing, aborting!"
exit 1
fi
# 1. copy translations to node_modules
# 2. touch node_modules/.copied~ to avoid copying node_modules again during build
cp -R "${GIT_ROOT}/translations" "${GIT_ROOT}/status-modules/"
[ "$use_chmod" == 'chmod' ] && chmod u+w "${GIT_ROOT}/node_modules"
cp -R "${GIT_ROOT}/status-modules" "${GIT_ROOT}/node_modules/"
[ -f "${GIT_ROOT}/node_modules/.copied~" ] && touch "${GIT_ROOT}/node_modules/.copied~"
[ "$use_chmod" == 'chmod' ] && chmod u-w "${GIT_ROOT}/node_modules"
set +e

5
status-modules/package.json
View File

@ -1,5 +0,0 @@
{
"name": "status-modules",
"version": "1.0.0",
"files": []
}