Creating submodules/ and lib/ to manage dependencies

mailpile · Jun 28, 2018 · aabae7c · aabae7c
1 parent acb9905
commit aabae7c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,9 @@
 [submodule "shared-data/contrib/print"]
 	path = shared-data/contrib/print
 	url = https://github.com/mailpile/Mailpile-print.git
+[submodule "submodules/gui-o-matic"]
+	path = submodules/gui-o-matic
+	url = https://github.com/mailpile/gui-o-matic
+[submodule "submodules/gui-o-mac-tic"]
+	path = submodules/gui-o-mac-tic
+	url = https://github.com/mailpile/gui-o-mac-tic
diff --git a/lib/gui_o_matic b/lib/gui_o_matic
@@ -0,0 +1 @@
+../submodules/gui-o-matic/gui_o_matic/
diff --git a/scripts/mailpile b/scripts/mailpile
@@ -4,11 +4,10 @@ import sys, os
 # Make imports work without PYTHONPATH
 mailpile_root = os.path.dirname(     # Mailpile root
     os.path.dirname(                 # scripts/
-        os.path.realpath(__file__)   # this script
-    )
-)
+        os.path.realpath(__file__))) # this script
 
 sys.path.append(mailpile_root)
+sys.path.append(os.path.join(mailpile_root, 'lib'))
 
 from mailpile.app import Main
 Main(sys.argv[1:])
diff --git a/submodules/gui-o-mac-tic b/submodules/gui-o-mac-tic
diff --git a/submodules/gui-o-matic b/submodules/gui-o-matic