Skip to content

Commit 4d1ff69

Browse files
Kikoalbertnetymk
Kiko
authored andcommitted
Update readme and remove old dependencies (parapluu#769)
* update README and debian install script * delete old documentation * add new documentation link * update name * update makefile
1 parent 4968289 commit 4d1ff69

25 files changed

+14
-2539
lines changed

Makefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ coverage: dirs pony
4545
SET_DIR=$(RUNTIME_DIR)/set
4646
FUTURE_DIR=$(RUNTIME_DIR)/future
4747
ENCORE_DIR=$(RUNTIME_DIR)/encore
48-
doc: stack-setup
49-
export ENCORE_MODULES="$(CURDIR)/modules/" && \
50-
make -C doc/encore/ && \
51-
stack haddock --system-ghc
5248

5349
dirs: $(INC_DIR) $(LIB_DIR)
5450

@@ -113,15 +109,13 @@ pony: dirs $(PONY_INC)
113109
clean:
114110
rm -rf .stack-work/dist
115111
rm -rf dist
116-
make -C doc/encore clean
117112
make -C $(SRC_DIR) clean
118113
rm -rf $(RELEASE_DIR)
119114
rm -rf $(INC_DIR)
120115
rm -rf $(LIB_DIR)
121-
rm -rf doc/html
122116
rm -rf coverage
123117

124118
vagrant:
125119
-@vagrant up
126120

127-
.PHONY: all encorec typecheck fetch-hs-deps test stress dirs pony clean doc vagrant coverage
121+
.PHONY: all encorec typecheck fetch-hs-deps test stress dirs pony clean vagrant coverage

README.md

+13-66
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,22 @@ setup the correct Haskell version and build and install Encore.
6868
If you do not want the script to alter your `$PATH` variable or change the Haskell version use the
6969
`-h` flag to see available options.
7070

71-
### Step 1: Preliminaries
71+
### Installing on OS X
72+
73+
#### Step 1: Preliminaries
7274

7375
We're using:
7476

7577
- doxygen v1.8.6
7678
- clang:
77-
Apple LLVM version 7.0.0 (clang-700.0.72)
78-
Target: x86_64-apple-darwin14.5.0
79+
Apple LLVM version 7.0.2 (clang-700.1.81)
80+
Target: x86_64-apple-darwin15.6.0
7981
Thread model: posix
80-
- g++ 4.8
8182
- pcre2-10.21 (for Regex library)
8283
- stack (the haskell build tool)
8384
- premake4 (Premake Build Script Generator) 4.3
84-
- `scribble` -- only for building the documentation
85-
86-
87-
In the below you find instructions for installing the preliminaries on OS X and on linux.
8885

89-
#### Installing the preliminaries on OS X
86+
Below you find instructions for installing the preliminaries on OS X.
9087

9188
##### Installing homebrew
9289

@@ -96,12 +93,6 @@ Go to http://brew.sh/, the instructions there work nicely. Make sure that your n
9693

9794
Run: `brew update; brew install doxygen`
9895

99-
##### Installing `scribble`
100-
101-
Go to the [Racket Download page](http://racket-lang.org/download/),
102-
download and install racket. The `scribble` tool comes with the racket
103-
distribution.
104-
10596
##### Installing `clang`:
10697

10798
Run: `brew update; brew install llvm`
@@ -140,9 +131,11 @@ in any directory. To do this, add this line to your `~/.bashrc` file, inserting
140131

141132
export PATH="<SOME_DIR>/encore/release:${PATH}"
142133

143-
### Step 4: Compiling and Running Encore Programs
134+
### Compiling and Running Encore Programs
144135

145-
Now you can compile a program by using
136+
This instructions are the same for any Linux distribution and OS X.
137+
138+
You can compile a program by using
146139

147140
$ encorec my_file.enc
148141

@@ -160,7 +153,7 @@ Alternatively, you can use a .enc-file as a script by adding `#! /usr/bin/env en
160153

161154
This will compile the file -- and run it.
162155

163-
You can find some example programs in the [programs](https://github.com/parapluu/encore/tree/master/programs) directory.
156+
You can find some example programs in the [test directory](https://github.com/parapluu/encore/tree/development/src/tests/encore/basic).
164157

165158
Have fun!
166159

@@ -184,52 +177,6 @@ Running `encorec foo.enc` will typecheck the source and produce the executable
184177
--help | Display this information.
185178
```
186179

187-
## Language Specification
188-
189-
Update the language specification whenever you change the Encore compiler.
190-
191-
There is a prebuilt version of the documentation in
192-
`doc/encore/prebuilt/` [direct link](https://github.com/parapluu/encore/raw/development/doc/encore/prebuilt/encore.pdf) for the people who do not have Scribble
193-
installed. Please also update these PDFs after updating the
194-
specification.
195-
196-
#### Generate documentation
197-
198-
Generate the documentation and check your changes by typing:
199-
200-
- `make doc`
201-
202-
After this, you should have a folder under `encore/doc/encore` named `build` that contains the documentation in pdf and html.
203-
204-
#### Update the language specification
205-
206-
The language specification has the following directory structure:
207-
208-
```
209-
├── Makefile
210-
├── README.md
211-
├── index.scrbl
212-
├── lang
213-
│ ├── client-side
214-
│ │ └── index.scrbl (todo)
215-
│ ├── getting-started
216-
│ │ └── index.scrbl
217-
│ ├── module-system
218-
│ │ └── index.scrbl (todo)
219-
│ ├── semantics
220-
│ │ └── index.scrbl (todo)
221-
│ └── syntax
222-
│ ├── index.scrbl
223-
│ └── grammar.scrbl (ongoing work)
224-
└── extras
225-
├── README.md
226-
└── math
227-
└── ...
228-
```
229-
230-
Update the files relevant to your changes. For instance, if you decide to
231-
introduce a new keyword in the language, such as `repeat`, you would need to
232-
update the file `grammar.scbl` in `upscale/doc/encore/lang/syntax/`.
180+
## Documentation
233181

234-
The easiest way (for now) to know what to modify is by generating the html,
235-
reading the section relevant to you and updating it.
182+
You can find the documentation in different formats [here](https://stw.gitbooks.io/the-encore-programming-language/content/)

debian-install.sh

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ sudo apt-get install -y $quiet\
4040
zlib1g-dev \
4141
ghc-7.10.3\
4242
cabal-install-1.22\
43-
racket\
4443
doxygen
4544

4645
wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.21.tar.bz2

doc/encore/Makefile

-27
This file was deleted.

doc/encore/README.md

-14
This file was deleted.

doc/encore/extras/README.md

-6
This file was deleted.

doc/encore/extras/math/math-hack.rkt

-25
This file was deleted.

doc/encore/extras/math/math-scribble/boxed.css

-7
This file was deleted.

doc/encore/extras/math/math-scribble/boxed.tex

-4
This file was deleted.

doc/encore/extras/math/math-scribble/htmlonly.css

-1
This file was deleted.

doc/encore/extras/math/math-scribble/htmlonly.tex

-1
This file was deleted.

doc/encore/extras/math/math-scribble/inbox.css

-2
This file was deleted.

doc/encore/extras/math/math-scribble/math-display.css

-2
This file was deleted.

doc/encore/extras/math/math-scribble/math-display.tex

-1
This file was deleted.

doc/encore/extras/math/math-scribble/math-inline.css

-4
This file was deleted.

doc/encore/extras/math/math-scribble/math-inline.tex

-1
This file was deleted.

0 commit comments

Comments
 (0)