self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Tools: Added back RN bundler command and cleaned up files

Browse Source
This commit is contained in:
Laurent Cozic 2020-02-24 17:30:11 +00:00
parent 7104d5b480
commit 421d7a947f
13 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD.md
View File

@ -47,11 +47,13 @@ First you need to setup React Native to build projects with native code. For thi
Then:
cd ReactNativeClient
react-native run-ios
# Or: react-native run-android
npm run start-android
# Or: npm run start-ios
To run the iOS application, it might be easier to open the file `ios/Joplin.xcworkspace` on XCode and run the app from there.
Normally the bundler should start automatically with the application. If it doesn't run `npm run start`.
## Building the clipper
cd Clipper/popup

2
ReactNativeClient/build_android.bat
View File

@ -1,2 +0,0 @@
cd android
gradlew.bat installDebug --console plain

9
ReactNativeClient/build_android_prod.bat
View File

@ -1,9 +0,0 @@
@echo off
rem Clear build dir if permission issue:
rem rmdir /S/Q android\app\build
setlocal
node ..\Tools\prepare-android-prod-build.js
cd android
gradlew.bat assembleRelease -PbuildDir=build --console plain

2
ReactNativeClient/clean_build.bat
View File

@ -4,4 +4,4 @@ rmdir /s/q android\build
rmdir /s/q android\.gradle
rmdir /s/q node_modules
npm install
start_server.bat
npm run start

1
ReactNativeClient/debug_log.bat
View File

@ -1 +0,0 @@
adb logcat *:S ReactNative:V ReactNativeJS:V

2
ReactNativeClient/debug_log.sh
View File

@ -1,2 +0,0 @@
#!/bin/bash
adb logcat *:S ReactNative:V ReactNativeJS:V

2
ReactNativeClient/ios/build-ios.sh
View File

@ -1,2 +0,0 @@
#!/bin/bash
xcodebuild -project Joplin.xcodeproj -configuration Release -scheme Joplin -destination id=3AF6C788-B6ED-41DD-85F0-32D719DB0DBE -derivedDataPath build

1
ReactNativeClient/package.json
View File

@ -5,6 +5,7 @@
"version": "0.8.0",
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start --reset-cache",
"start-ios": "react-native run-ios",
"start-android": "react-native run-android",
"postinstall": "jetify && npm run build",

1
ReactNativeClient/run_ios.sh
View File

@ -1 +0,0 @@
react-native run-ios --simulator 'iPhone 6'

2
ReactNativeClient/start_server.bat
View File

@ -1,2 +0,0 @@
@echo off
npm start -- --reset-cache

2
ReactNativeClient/start_server.sh
View File

@ -1,2 +0,0 @@
#!/bin/bash
npm start -- --reset-cache

13
Tools/git-hooks/pre-commit-sh
View File

@ -1,13 +0,0 @@
#!/bin/sh
# In pre-commit, PWD is set to the root of the repo
# https://longair.net/blog/2011/04/09/missing-git-hooks-documentation/
ROOT_DIR="$PWD"
# If any README file has been changed, update the website
git status -s | grep ' README\| readme\| build-website.js' > /dev/null 2>&1
readmeStatus=$?
if [ $readmeStatus -eq 0 ]; then
node "$ROOT_DIR/Tools/build-website.js"
git add docs
fi

8
joplin.sublime-project
View File

@ -34,7 +34,9 @@
"ElectronClient/gui/ResourceScreen.js",
"ElectronClient/gui/ShareNoteDialog.js",
"ElectronClient/gui/TinyMCE.js",
"ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js"
"ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js",
"ReactNativeClient/setUpQuickActions.js",
"ReactNativeClient/android/app/joplin.keystore"
],
"folder_exclude_patterns":
[
@ -74,7 +76,9 @@
"Clipper/dist",
"ReactNativeClient/lib/rnInjectedJs",
"ReactNativeClient/ios/Pods",
"CliClient/locales-build"
"CliClient/locales-build",
"ReactNativeClient/lib/vendor",
"ReactNativeClient/ios/Joplin-tvOS"
],
"path": "."
}