Skip to content

Commit 8d65f51

Browse files
committed
pip package tweakage, plus md 2 html magic.
1 parent d1166cf commit 8d65f51

File tree

2 files changed

+35
-10
lines changed

2 files changed

+35
-10
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ all:
1212
@echo 'To check clang : "make check_clang"'
1313
@echo 'To check dragonegg : "make check_dragonegg"'
1414
@echo ''
15+
@echo 'To turn md 2 html : "make zippity"'
16+
@echo ''
17+
@echo 'then upload the zip file to https://pypi.python.org/pypi'
18+
@echo ''
19+
1520

1621

1722
#local editable install for developing
@@ -47,6 +52,11 @@ check_dragonegg:
4752
cd test; python -m unittest -v test_base_driver test_dragonegg_driver
4853

4954

55+
zippity:
56+
rm -rf doczip*; mkdir doczip;
57+
cat README.md | pandoc -f markdown_github > doczip/index.html
58+
zip -r -j doczip.zip doczip
59+
5060
clean:
5161
rm -f wllvm/*.pyc wllvm/*~
5262

README.md

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,18 @@ Building a bitcode module with clang
105105
CC=wllvm ./configure
106106
make
107107

108-
# Produces pkg-config.bc
108+
This should produce the executable `pkg-config`. To extract the bitcode:
109+
109110
extract-bc pkg-config
110111

112+
which will produce the bitcode module `pkg-config.bc`.
113+
114+
111115
Tutorials
112116
=========
113117

114118
A gentler set of instructions on building apache in a vagrant Ubuntu 14.04 can be found
115-
[here,](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial.md) and
116-
for Ubuntu 16.04
117-
[here.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-ubuntu-16.04.md)
119+
[here,](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial.md) and for Ubuntu 16.04 [here.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-ubuntu-16.04.md)
118120

119121
Building a bitcode module with dragonegg
120122
========================================
@@ -128,9 +130,12 @@ Building a bitcode module with dragonegg
128130
CC=wllvm ./configure
129131
make
130132

131-
# Produces pkg-config.bc
133+
Again, this should produce the executable `pkg-config`. To extract the bitcode:
134+
132135
extract-bc pkg-config
133136

137+
which will produce the bitcode module `pkg-config.bc`.
138+
134139

135140
Building bitcode archive
136141
========================
@@ -145,22 +150,30 @@ Building bitcode archive
145150
# Produces src/LinearMath/libLinearMath.bca
146151
extract-bc src/LinearMath/libLinearMath.a
147152

148-
# Produces src/LinearMath/libLinearMath.a.bc
153+
Note that by default extracting bitcode from an archive produces
154+
an archive of bitcode. You can also extract the bitcode directly into a module.
155+
149156
extract-bc -b src/LinearMath/libLinearMath.a
150157

158+
produces `src/LinearMath/libLinearMath.a.bc`.
151159

152160

153161

154162
Building an Operating System
155163
============================
156164

157-
To see how to build freeBSD 10.0 from scratch check out this
158-
[guide.](../master/doc/tutorial-freeBSD.md)
165+
To see how to build freeBSD 10.0 from scratch check out this
166+
[guide.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/doc/tutorial-freeBSD.md)
159167

160168

161169
Configuring without building bitcode
162170
================================
163171

172+
Sometimes it is necessary to disable the production of bitcode.
173+
Typically this is during configuration, where the production
174+
of unexpected files can confuse the configure script. For this
175+
we have a flag `WLLVM_CONFIGURE_ONLY` which can be used as
176+
follows:
164177

165178
WLLVM_CONFIGURE_ONLY=1 CC=wllvm ./configure
166179
CC=wllvm make
@@ -180,9 +193,11 @@ Building a bitcode archive then extracting the bitcode
180193
extract-bc libjansson.a
181194
llvm-ar x libjansson.bca
182195
ls -la
183-
196+
184197

185198

199+
200+
186201
Debugging
187202
=========
188203

@@ -214,4 +229,4 @@ it might point out what is wrong.
214229
License
215230
=======
216231

217-
WLLVM is released under the MIT license. See the file `LICENSE` for details.
232+
WLLVM is released under the MIT license. See the file `LICENSE` for [details.](https://github.com/SRI-CSL/whole-program-llvm/blob/master/LICENSE)

0 commit comments

Comments
 (0)