Skip to content

Commit

Permalink
ΔOS v0.8-alpha.4 (1deos#116)
Browse files Browse the repository at this point in the history
* add-external: updates

* update-meta: add-hello:c,py

* update-meta: Vagrantfile

* update-meta: Vagrantfile

* update: Deosfile

* update-meta: Vagrantfile

* tmp: fix

* tmp: fix

* update-wiki: sidebar

* update-meta: vagrantfile

* update-meta: vagrantfile

* update-meta: wiki

* add-meta: .deosrc

* update-meta: bootstrap

* update-meta: bootstrap

* mv: var/asset -> var/assets

* update-meta: .deosrc

* update-meta: logger

* update-meta: test headers

* update-meta: bootstrap

* add-meta: logger

* update-meta: logger

* update-wiki: home

* update-meta: vagrantfile

* update-meta: makefile

* update-meta: vm

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: Makefile

* update-meta: makefile

* update-meta: makefile:

* update-meta: makefile

* update-data: blockstack

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile

* update-meta: makefile
  • Loading branch information
DeSantis committed Dec 24, 2016
1 parent 2f1ab65 commit 7d2522f
Show file tree
Hide file tree
Showing 55 changed files with 69,157 additions and 1,344 deletions.
26 changes: 24 additions & 2 deletions .deosrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,39 @@ TRUE:=1

IS_FALSE:=$(FALSE)
IS_TRUE:=$(TRUE)

IS_MAC:=Darwin
IS_LINUX:=Linux

BASEDIR:=$(CURDIR)
HOSTOS:=$(shell uname -s)
ISFALSE:=$(FALSE)
ISLINUX:=Linux
ISMAC:=Darwin
ISTRUE:=$(TRUE)
SETCACHE:=$(TRUE)
USECACHE:=$(FALSE)

ifeq ($(HOSTOS),$(IS_MAC))
UPCMD:="vagrant up --provider virtualbox"
ifeq ($(HOSTOS),$(ISMAC))
LOGGER:=$(BASEDIR)/.deos/bin/darwin/logger
PRINTM:=$(BASEDIR)/.deos/bin/darwin/print
SPINNER:=$(BASEDIR)/.deos/bin/darwin/spinner
else
LOGGER:=$(BASEDIR)/.deos/bin/travis/logger
PRINTM:=$(BASEDIR)/.deos/bin/travis/print
SPINNER:=$(BASEDIR)/.deos/bin/travis/spinner
endif

DeOS_GIT_REPO_BIPS:=git@github.com:bitcoin/bips.git
DeOS_GIT_REPO_HYPER:=git@github.com:zeit/hyper.git
DeOS_GIT_REPO_WEB:=git@github.com:webpy/webpy.git
DeOS_GIT_REPO_WIKI:=git@github.com:DeSantisInc/DeOS.wiki.git

export DeOS_VM_BOX:=bento/ubuntu-16.04
export DeOS_VM_SHELL_DEFAULT:=bash -c 'BASH_ENV=/etc/profile exec bash'
export DeOS_VM_SHELL_SSH:=bash -l

DeOS_ADD_DOTDEOS:=mkdir .deos .deos/bin .deos/bin/darwin .deos/bin/vagrant .deos/bin/travis .deos/obj .deos/obj/darwin .deos/obj/vagrant .deos/obj/travis .deos/venv .deos/venv/darwin .deos/venv/vagrant .deos/venv/travis
DeOS_ADD_TRAVIS:=gem install travis --no-rdoc --no-ri
DeOS_BIN_TRAVIS:=$(shell which travis)
DeOS_RM_DOTDEOS:=rm -rf .deos
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ etc/blockstack/*
etc/zerotier/*
node_modules/
var/backup/*
var/build/
var/log/deos/*

#[dotfiles]
Expand Down
28 changes: 22 additions & 6 deletions Deosfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
author=atd@gmx.it
version=v0.8-alpha.3
version=v0.8-alpha.4

[.deosrc]
meta=meta/Δ:.deosrc.md
type=make

[.nvmrc]
meta=meta/Δ:.nvmrc.md
Expand All @@ -17,9 +21,17 @@ type=lz
meta=meta/Δ:src:example.md
type=sh

[var/build/bootstrap.sh]
meta=meta/Δ:bootstrap.md
type=sh
[src/hello.c]
meta=meta/Δ:src:hello:c.md
type=c

[src/hello.py]
meta=meta/Δ:src:hello:py.md
type=python

[src/logger.py]
meta=meta/Δ:src:logger.md
type=python

[.editorconfig]
meta=meta/Δ:.editorconfig.md
Expand All @@ -34,9 +46,13 @@ meta=meta/Δ:.travis.md
type=yaml

[Makefile]
meta=meta/Δ:Makefile.md
meta=meta/Δ:makefile.md
type=make

[Vagrantfile]
meta=meta/Δ:Vagrantfile.md
meta=meta/Δ:vagrantfile.md
type=ruby

[bootstrap.sh]
meta=meta/Δ:bootstrap.md
type=sh
Loading

0 comments on commit 7d2522f

Please sign in to comment.