PR: DeOS, v1.2-deos

.deosrc

@@ -20,37 +20,3 @@ LIB                := $(CURDIR)/lib
 OBJ                := $(CURDIR)/obj/darwin
 SRC                := $(CURDIR)/src
 TEST               := $(CURDIR)/test
-MACRO              := $(INCLUDE)/.macro
-VAULT              := $(APP)/vault
-VENV               := $(CURDIR)/venv/darwin
-FILES              := $(wildcard $(LIB)/*.c)
-TFILES             := $(wildcard $(TEST)/*.c)
-TBINS              := $(patsubst $(TEST)/%,$(BIN)/darwin/%,$(TFILES:.c=.test))
-OBJECTS            := $(patsubst $(LIB)/%,$(OBJ)/%,$(FILES:.c=.o))
-UI_GENERATED       := $(VAULT)/src/ui_mainwindow.py\
-                      $(VAULT)/src/ui_addgroup_dialog.py\
-                      $(VAULT)/src/ui_trezor_passphrase_dialog.py\
-                      $(VAULT)/src/ui_add_password_dialog.py\
-                      $(VAULT)/src/ui_initialize_dialog.py\
-                      $(VAULT)/src/ui_enter_pin_dialog.py\
-                      $(VAULT)/src/ui_trezor_chooser_dialog.py
-CC                 := clang
-CFLAGS             := -std=c89 -Wall -g
-CEXE               := $(BIN)/darwin/deos
-CINCLUDE           := -I$(VENV)/include/python2.7 -I$(MACRO)
-CLINK              := -lpython2.7
-CTARGET            := $(SRC)/main.c
-MKDIR              := mkdir
-NEWENV             := virtualenv --always-copy --no-site-packages
-PIP                := pip
-PYQT               := ext/pyqt
-RM                 := rm -rf
-SETENV             := source $(VENV)/bin/activate
-DEOS               := $(SETENV) && deos
-QMAKE              := /usr/local/Cellar/qt5/5.7.0/bin/qmake
-REQUIRE            := $(ETC)/python/requirements.txt
-SIP                := ext/sip
-VIRTUAL            := venv/darwin
-XMCC               := cd $(SRC) && python xmcc.py
-XMOD               := chmod +x
-

.git-crypt/.gitattributes

@@ -0,0 +1,3 @@
+# Do not edit this file.  To specify the files to encrypt, create your own
+# .gitattributes file in the directory where your files are.
+* !filter !diff

.gitattributes

@@ -1 +1,2 @@
 * text=auto
+*.key filter=git-crypt diff=git-crypt

.gitignore

@@ -8,27 +8,25 @@ app/vault/ui_*py
 *.pwdb
 
 #[dotfolders]
-.backup/
+.DocumentRevisions-V100/
+.fseventsd/
+.TemporaryItems/
+.Trashes/
 
 #[folders]
 app/vault/src/atdlib/
-bin/
 etc/blockstack/*
 etc/zerotier/*
 ext/pyqt/
 ext/sip/
 include/.macro/
-obj/
 node_modules/
 src/atdlib/build/
 tests/blockstack/integration/*
-var/backup/*
-var/log/deos/*
-var/privkey/*
-venv/
 
 #[dotfiles]
 .DS_Store
+.metadata_never_index
 .nvmrc
 
 #[files]

.gitmodules

@@ -0,0 +1,36 @@
+[submodule "app/bitcoin.sh"]
+	path = app/bitcoin.sh
+	url = https://github.com/0x47d/bitcoin.sh.git
+[submodule "app/urbit.sh"]
+	path = app/urbit.sh
+	url = https://github.com/0x47d/urbit.sh.git
+[submodule "app/code.news"]
+	path = app/code.news
+	url = https://github.com/0x47d/code.news.git
+[submodule "app/freebird.im"]
+	path = app/freebird.im
+	url = https://github.com/0x47d/freebird.im.git
+[submodule "app/urbit.news"]
+	path = app/urbit.news
+	url = https://github.com/0x47d/urbit.news.git
+[submodule "var/wiki"]
+	path = var/wiki
+	url = https://github.com/0x47d/deos-wiki.git
+[submodule "app/desantis.co"]
+	path = app/desantis.co
+	url = https://github.com/0x47d/desantis.co.git
+[submodule "ext/git-crypt"]
+	path = ext/git-crypt
+	url = https://github.com/0x47d/git-crypt.git
+[submodule "doc/bips"]
+	path = doc/bips
+	url = https://github.com/b17c01n/bips.git
+[submodule "doc/macos-security-and-privacy"]
+	path = doc/macos-security-and-privacy
+	url = https://github.com/0x47d/macos-security-and-privacy.git
+[submodule "doc/js-stack"]
+	path = doc/js-stack
+	url = https://github.com/0x47d/js-stack.git
+[submodule "ext/urbit"]
+	path = ext/urbit
+	url = https://github.com/0x47d/urbit.git

Makefile

@@ -1,111 +1,19 @@
 include .deosrc
 
-all:
-	@ $(MAKE) install
-	@ $(MAKE) run
+all: init
+	@-echo "$@";
 
-atdlib:
-	@-rm -rf src/atdlib/build/ src/atdlib/atdlib/*.pyc
-	@-$(SETENV) && cd src/atdlib && python setup.py install
-	@-$(SETENV) && cd src/atdlib && python setup.py build
-	@-$(SETENV) && cd test && python main.py
-	@-rm -rf src/atdlib/atdlib/*.pyc
-
-help:
-	@ echo 'export PATH="$(BIN)/darwin:$(PATH)"'
-
-run: build
-	@ $(DEOS)
-
-build: $(OBJECTS)
-	@-$(XMCC)
-	@ $(CC) $(CFLAGS) -I$(INCLUDE) $(CINCLUDE) $(CTARGET) $(OBJECTS) \
-		-o $(CEXE) $(CLINK)
-	@ $(XMOD) $(CEXE)
-	@ clear
-
-install: clean
-	@-$(MKDIR) $(BIN) $(BIN)/darwin $(EXT) $(INCLUDE) $(LIB) $(MACRO)
-	@ $(MAKE) $(VIRTUAL)
-	@ $(MAKE) $(SIP)
-	@ $(MAKE) $(PYQT)
-	@ clear
-
-uninstall: clean
-	@-$(RM) $(PYQT) $(SIP) $(VENV)
-	@ clear
+init: clean
+	@-mkdir .DocumentRevisions-V100;
+	@-mkdir .fseventsd;
+	@-touch .fseventsd/no_log;
+	@-mkdir .TemporaryItems;
+	@-mkdir .Trashes;
+	@-touch .metadata_never_index;
 
 clean:
-	@-$(RM) $(CEXE)* $(MACRO)/*.def
-	@ clear
-
-freeze:
-	@ $(SETENV) && pip freeze > etc/python/requirements.txt
-
-tdd:
-	@-rm -rf app/tdd
-	@-$(SETENV) && cd app && django-admin.py startproject tdd && \
-		cd tdd && python manage.py migrate && python manage.py runserver &
-	@-$(SETENV) && python $(TEST)/functional_tests.py
-	@-rm geckodriver.log
-	@-pkill -f firefox
-	@-kill `ps aux | grep 'manage.py runserver' | awk '{print $2}'` \
-		>/dev/null 2>/dev/null
-	@-rm -rf app/tdd
-
-test: $(TBINS)
-
-$(BIN)/darwin/%.test: $(OBJECTS)
-	@#-rm docs/atdlib/$*.dot
-	@-clang -std=c89 -I$(INCLUDE) test/$*.c $(OBJECTS) -o bin/darwin/$*.test
-	@-$(XMOD) bin/darwin/$*.test
-	@-bin/darwin/$*.test
-	@-rm $(BIN)/darwin/*.test
-	@#dot -Tpng docs/atdlib/$*.dot > var/img/$*.png
-
-vault: $(UI_GENERATED)
-	@-rm $(VAULT)/src/*.pyc
-	@-rm -rf $(VAULT)/src/atdlib
-	@-mkdir $(VAULT)/src/atdlib
-	@-touch $(VAULT)/src/atdlib/__init__.py
-	@-cp $(SRC)/vault.py $(VAULT)/src/atdlib/vault.py
-	@-$(SETENV) && python $(VAULT)/src/vault.py
-	@-rm $(VAULT)/src/*.pyc
-	@-rm -rf $(VAULT)/src/atdlib
-
-vault.sdk:
-	@-$(SETENV) && python src/vault.py
-
-$(VAULT)/src/ui_%.py: $(VAULT)/view/%.ui
-	@-$(SETENV) && $(VENV)/bin/pyuic4 -o $@ $<
-
-$(OBJ)/%.o: $(LIB)/%.c $(INCLUDE)/%.h
-	@-rm $(OBJ)/$*.o
-	@ $(CC) -std=c89 -Wall -g -I$(INCLUDE) -c $(LIB)/$*.c -o $(OBJ)/$*.o
-	@ clear
-
-$(VIRTUAL):
-	@-$(MKDIR) venv $(VIRTUAL)
-	@ $(NEWENV) $(VENV)
-	@ $(SETENV) && $(PIP) install -r $(REQUIRE)
-	@ clear
-
-$(PYQT):
-	@ cp $(EXT)/.cache/PyQt-mac-gpl-4.11.4.tar.gz $(EXT)/pyqt.tar.gz
-	@ gunzip $(EXT)/pyqt.tar.gz && tar -xvf $(EXT)/pyqt.tar
-	@-$(RM) $(EXT)/pyqt.tar
-	@ mv PyQt-mac-gpl-4.11.4 $(EXT)/pyqt
-	@ $(SETENV) && cd $(EXT)/pyqt && \
-	  python configure-ng.py --confirm-license --qmake=$(QMAKE) && \
-	  make && make install
-	@ clear
-
-$(SIP):
-	@ cp $(EXT)/.cache/sip-4.18.1.tar.gz $(EXT)/sip.tar.gz
-	@ gunzip $(EXT)/sip.tar.gz && tar -xvf $(EXT)/sip.tar
-	@-$(RM) $(EXT)/sip.tar
-	@ mv sip-4.18.1 $(EXT)/sip
-	@ $(SETENV) && cd $(EXT)/sip && \
-	  python configure.py --incdir=$(VENV)/include/python2.7 && \
-	  make && make install
-	@ clear
+	@-rm -rf .DocumentRevisions-V100/;
+	@-rm -rf .fseventsd/;
+	@-rm -rf .TemporaryItems/;
+	@-rm -rf .Trashes/;
+	@-rm .metadata_never_index;

README.md

@@ -1,4 +1,4 @@
-# [ΔOS: Decentralized Operating System](https://www.desantis.io) | [![Build Status](https://travis-ci.org/DeSantisInc/DeOS.svg?branch=master)](https://travis-ci.org/DeSantisInc/DeOS)
+# [DeOS: Decentralized Operating System](https://bitcoin.sh) | [![Build Status](https://travis-ci.org/DeSantisInc/DeOS.svg?branch=master)](https://travis-ci.org/DeSantisInc/DeOS)
 
 > *The languages of intelligence (writing) and self-interest (money) are the*
 > *mind's greatest creations; both must be decentralized or all is lost.*

RELEASE.md

@@ -1,6 +1,15 @@
 # Release Notes
 
-## ΔOS v0.8-alpha.8
+## DeOS v0.1.2-atd.id.1
+
+* WIP
+
+## DeOS v0.1.2-atd.id.0
+
+* init-fork: `atd.id`
+* fix: `travis-ci`
+
+## DeOS v0.8-alpha.8
 
 * add-`atdlib`: `vault_module.c`
 * add-`atdlib`: `deos_module.c`