Updated .gitignore and automated setup procedure (oppia#3943)

* Added local property condition for M1 Mac * Added comment * Improved some Contributor Experience * NIT * Fixed command only for darwin * NIT * seperated the script, removed misc and run configurations * added EOF * Update scripts/buf_m1_mac_setup.sh Co-authored-by: Akshay Nandwana <[email protected]> * Updated .gitignore to only track particular files Co-authored-by: Akshay Nandwana <[email protected]>
kritigupta45 · Nov 10, 2021 · 7465b0b · 7465b0b
1 parent 65f04b7
commit 7465b0b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,10 @@
 *.iml
 .gradle
 /local.properties
-/.idea/assetWizardSettings.xml
-/.idea/caches
-/.idea/compiler.xml
-/.idea/gradle.xml
-/.idea/jarRepositories.xml
-/.idea/libraries
-/.idea/modules.xml
-/.idea/navEditor.xml
-/.idea/vcs.xml
-/.idea/workspace.xml
+.idea/*
+!.idea/encodings.xml
+!.idea/codeStyles/Project.xml
+!.idea/codeStyleConfig.xml
 app/build
 data/build
 domain/build

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/scripts/buf_m1_mac_setup.sh b/scripts/buf_m1_mac_setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Setup protobuf platform for M1 Mac
+arch_name="$(uname -m)"
+if [ "${arch_name}" = "x86_64" ] && [[ "$OSTYPE" == "darwin"* ]]; then
+ if [ "$(sysctl -in sysctl.proc_translated)" = "1" ]; then
+ echo 'protobuf_platform=osx-x86_64' >> ../oppia-android/local.properties
+ echo 'Added protobuf platform to local properties.'
+ fi
+fi
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -25,3 +25,6 @@ bash ../oppia-android/scripts/checkstyle_download.sh
 
 # Download buf
 bash ../oppia-android/scripts/buf_download.sh
+
+# Add protobuf platform for M1 Mac
+bash ../oppia-android/scripts/buf_m1_mac_setup.sh