Changeset 2ab67b9 for doc/proposals


Ignore:
Timestamp:
May 30, 2017, 7:49:45 AM (8 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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:
f3fc631f
Parents:
8f61052c (diff), 4a368547 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:
doc/proposals/concurrency
Files:
8 added
5 deleted
2 edited
8 moved

Legend:

Unmodified
Added
Removed

  • doc/proposals/concurrency/.gitignore

    r8f61052c r2ab67b9  
    1 concurrency.aux
    2 concurrency.acn
    3 concurrency.acr
    4 concurrency.alg
    5 concurrency.bbl
    6 concurrency.blg
    7 concurrency.brf
    8 concurrency.dvi
    9 concurrency.glg
    10 concurrency.glo
    11 concurrency.gls
    12 concurrency.idx
    13 concurrency.ind
    14 concurrency.ist
    15 concurrency.log
    16 concurrency.out
    17 concurrency.pdf
    18 concurrency.ps
    19 version.aux
    20 monitor.tex
    21 ext_monitor.tex
     1build/*.aux
     2build/*.acn
     3build/*.acr
     4build/*.alg
     5build/*.bbl
     6build/*.blg
     7build/*.brf
     8build/*.dvi
     9build/*.glg
     10build/*.glo
     11build/*.gls
     12build/*.idx
     13build/*.ind
     14build/*.ist
     15build/*.log
     16build/*.out
     17build/*.ps
     18build/*.tex
     19build/*.toc
     20*.pdf
     21
     22examples

  • doc/proposals/concurrency/Makefile

    r8f61052c r2ab67b9  
    11## Define the appropriate configuration variables.
    22
    3 TeXLIB = .:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:
    4 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
    5 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
     3TeXLIB = .:./style:./text:./annex:./build:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:
     4LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=build -interaction=nonstopmode
     5BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
    66
    77## Define the text source files.
    88
    99SOURCES = ${addsuffix .tex, \
    10 concurrency \
    11 style \
    12 cfa-format \
    13 glossary \
     10thesis \
     11style/style \
     12style/cfa-format \
     13annex/glossary \
     14text/intro \
     15text/basics \
     16text/concurrency \
     17text/parallelism \
    1418}
    1519
    16 FIGURES = ${addsuffix .tex, \
     20FIGURES = ${addprefix build/, ${addsuffix .tex, \
    1721        monitor \
    1822        ext_monitor \
    19 }
     23}}
    2024
    2125PICTURES = ${addsuffix .pstex, \
    … …  
    3034## Define the documents that need to be made.
    3135
    32 DOCUMENT = concurrency.pdf
     36DOCUMENT = thesis.pdf
    3337
    3438# Directives #
    … …  
    3741
    3842clean :
    39         rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf *.glg *.glo *.gls *.ist *.acn *.acr *.alg \
    40                 ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
     43        @rm -fv ${DOCUMENT} \
     44        build/*.acn     \
     45        build/*.acr     \
     46        build/*.alg     \
     47        build/*.aux     \
     48        build/*.bbl     \
     49        build/*.blg     \
     50        build/*.brf     \
     51        build/*.cf      \
     52        build/*.dvi     \
     53        build/*.glg     \
     54        build/*.glo     \
     55        build/*.gls     \
     56        build/*.ist     \
     57        build/*.idx     \
     58        build/*.ilg     \
     59        build/*.ind     \
     60        build/*.log     \
     61        build/*.out     \
     62        build/*.ps      \
     63        build/*.pstex_t \
     64        build/*.tex     \
     65        build/*.toc     \
     66
    4167
    4268# File Dependencies #
    4369
    44 ${DOCUMENT} : ${basename ${DOCUMENT}}.ps
     70${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
    4571        ps2pdf $<
    4672
    47 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
     73build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
    4874        dvips $< -o $@
    4975
    50 ${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
    51                 ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
    52         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
    53         if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
    54         # Must have *.aux file containing citations for bibtex
    55         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
    56         -${BibTeX} ${basename $@}
    57         # Some citations reference others so run steps again to resolve these citations
    58         ${LaTeX} ${basename $@}.tex
    59         -${BibTeX} ${basename $@}
    60         # Make index from *.aux entries and input index at end of document
    61         makeglossaries ${basename $@}
    62         #${LaTeX} ${basename $@}.tex
    63         # Run again to get index title into table of contents
    64         ${LaTeX} ${basename $@}.tex
    65         -./bump_ver.sh
    66         ${LaTeX} ${basename $@}.tex
     76build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
     77
     78        @ if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi                           # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
     79        @ echo "Citation lookup"                                                                                        # Must have *.aux file containing citations for bibtex
     80        @ if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename ${notdir $@}}.tex ; fi
     81        @ echo "Citation Pass 1"
     82        @ -${BibTeX} ${basename $@}                                                                                     # Some citations reference others so run steps again to resolve these citations
     83        @ echo "Citation Pass 2"
     84        @ ${LaTeX} ${basename ${notdir $@}}.tex
     85        @ -${BibTeX} ${basename $@}
     86        @ echo "Glossary"
     87        makeglossaries -q -s ${basename $@}.ist ${basename $@}                                          # Make index from *.aux entries and input index at end of document
     88        @ echo ".dvi generation"
     89        @ -build/bump_ver.sh
     90        @ ${LaTeX} ${basename ${notdir $@}}.tex                                                                 # Run again to get index title into table of contents
    6791
    6892
    … …  
    7296## Define the default recipes.
    7397
    74 %.tex : %.fig
     98build/%.tex : figures/%.fig
    7599        fig2dev -L eepic $< > $@
    76100
    77 %.ps : %.fig
     101build/%.ps : figures/%.fig
    78102        fig2dev -L ps $< > $@
    79103
    80 %.pstex : %.fig
     104build/%.pstex : figures/%.fig
    81105        fig2dev -L pstex $< > $@
    82106        fig2dev -L pstex_t -p $@ $< > $@_t

  • doc/proposals/concurrency/style/cfa-format.tex

    r8f61052c r2ab67b9  
    1 \usepackage{xcolor}
     1\usepackage[usenames,dvipsnames]{xcolor}
    22\usepackage{listings}
    33\usepackage{inconsolata}
    … …  
    144144  % moredelim=** allows cumulative application
    145145}
    146 \lstset{
    147   morekeywords=[2]{nomutex,mutex,thread,wait,wait_release,signal,signal_block,accept,monitor,suspend,resume,coroutine}
    148   language = CFA,
    149   style=defaultStyle
    150 }
     146
    151147\lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
    152148
    153 \lstnewenvironment{cfacode}[1][]{ %
    154   \lstset{ %
    155     language = CFA, %
    156     style=defaultStyle, %
    157     morekeywords=[2]{nomutex,mutex,thread,wait,signal,signal_block,accept,monitor,suspend,resume,coroutine}, %
    158     #1 %
    159   } %
     149\lstnewenvironment{ccode}[1][]{
     150  \lstset{
     151    language = C,
     152    style=defaultStyle,
     153    #1
     154  }
     155}{}
     156
     157\lstnewenvironment{cfacode}[1][]{
     158  \lstset{
     159    language = CFA,
     160    style=defaultStyle,
     161    #1
     162  }
    160163}{}
    161164
    … …  
    169172
    170173\lstnewenvironment{cppcode}[1][]{
     174  \lstset{
     175    language = c++,
     176    style=defaultStyle,
     177    #1
     178  }
     179}{}
     180
     181\lstnewenvironment{ucppcode}[1][]{
    171182  \lstset{
    172183    language = c++,
    … …  
    219230\newcommand{\one}{\lstinline{one_t}\xspace}
    220231\newcommand{\ateq}{\lstinline{\@=}\xspace}
     232\newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
     233\newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}
Note: See TracChangeset for help on using the changeset viewer.