Changeset db0fa7c

Timestamp:

May 15, 2017, 3:30:44 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

547e9b7

Parents:

3bd1eb4

Message:

Moved files and did some cleanup in the directories

Location:

doc/proposals/concurrency

Files:

• Makefile (modified) (4 diffs)
• annex/glossary.tex (moved) (moved from doc/proposals/concurrency/glossary.tex)
• annex/local.bib (moved) (moved from doc/proposals/concurrency/local.bib)
• build/bump_ver.sh (moved) (moved from doc/proposals/concurrency/bump_ver.sh)
• build/version (added)
• figures/ext_monitor.fig (moved) (moved from doc/proposals/concurrency/ext_monitor.fig)
• figures/monitor.fig (moved) (moved from doc/proposals/concurrency/monitor.fig)
• notes/cor-thread-traits.c (moved) (moved from doc/proposals/concurrency/cor-thread-traits.c)
• notes/lit-review.md (moved) (moved from doc/proposals/concurrency/lit-review.md)
• notes/notes.md (moved) (moved from doc/proposals/concurrency/notes.md)
• style/cfa-format.tex (moved) (moved from doc/proposals/concurrency/cfa-format.tex)
• style/style.tex (moved) (moved from doc/proposals/concurrency/style.tex)
• text/intro.tex (added)
• version (deleted)

doc/proposals/concurrency/Makefile

@@ -8 +8 @@
 
 SOURCES = ${addsuffix .tex, \
-concurrency \
+thesis \
 style \
 cfa-format \
@@ -30 +30 @@
 ## Define the documents that need to be made.
 
-DOCUMENT = concurrency.pdf
+DOCUMENT = thesis.pdf
 
 # Directives #
@@ -42 +42 @@
 # File Dependencies #
 
-${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
         ps2pdf $<
 
-${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+build/${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips $< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
                 ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
-        # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-        if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
-        # Must have *.aux file containing citations for bibtex
-        if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-        -${BibTeX} ${basename $@}
-        # Some citations reference others so run steps again to resolve these citations
-        ${LaTeX} ${basename $@}.tex
-        -${BibTeX} ${basename $@}
-        # Make index from *.aux entries and input index at end of document
-        makeglossaries ${basename $@}
-        #${LaTeX} ${basename $@}.tex
-        # Run again to get index title into table of contents
-        ${LaTeX} ${basename $@}.tex
-        -./bump_ver.sh
-        ${LaTeX} ${basename $@}.tex
+        # Conditionally create the build folder
+        if [ ! -r build ] ; then mkdir build ; fi
+        # # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
+        # if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+        # # Must have *.aux file containing citations for bibtex
+        # if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
+        # -${BibTeX} ${basename $@}
+        # # Some citations reference others so run steps again to resolve these citations
+        # ${LaTeX} ${basename $@}.tex
+        # -${BibTeX} ${basename $@}
+        # # Make index from *.aux entries and input index at end of document
+        # makeglossaries ${basename $@}
+        # #${LaTeX} ${basename $@}.tex
+        # # Run again to get index title into table of contents
+        # ${LaTeX} ${basename $@}.tex
+        # -./bump_ver.sh
+        # ${LaTeX} ${basename $@}.tex
 
 
@@ -72 +74 @@
 ## Define the default recipes.
 
-%.tex : %.fig
+build/%.tex : %.fig
         fig2dev -L eepic $< > $@
 
-%.ps : %.fig
+build/%.ps : %.fig
         fig2dev -L ps $< > $@
 
-%.pstex : %.fig
+build/%.pstex : %.fig
         fig2dev -L pstex $< > $@
         fig2dev -L pstex_t -p $@ $< > $@_t