fix source error after reformatting
This commit is contained in:
parent
b2a68cc7ef
commit
3a9a2633bf
GPG key ID:
B0BA4EEC0714F8E6
40
Makefile
40
Makefile
|
|
@ -1,6 +1,7 @@
|
|||
# Build variables
|
||||
BASEBDIR=./build
|
||||
BDIR=$(BASEBDIR)
|
||||
TDIR=$(BASEBDIR)/tmp
|
||||
SDIR=./src
|
||||
BNAME=promise-`git show --oneline | head -1 | cut -d" " -f1`
|
||||
CONF=default.cfg
|
||||
|
|
@ -28,58 +29,59 @@ timestamp: mkbuild
|
|||
|
||||
mkbuild:
|
||||
if [ ! -d $(BDIR) ]; then mkdir -p $(BDIR); fi
|
||||
if [ ! -d $(TDIR) ]; then mkdir -p $(TDIR); fi
|
||||
|
||||
mktemp: mkbuild
|
||||
if [ ! -f $(BDIR)/$(TEMP) ]; then cp $(SDIR)/$(SOURCE) $(BDIR)/$(TEMP); fi
|
||||
if [ ! -f $(TDIR)/$(TEMP) ]; then cp $(SDIR)/$(SOURCE) $(TDIR)/$(TEMP); fi
|
||||
|
||||
wordcount: mktemp
|
||||
# This only works when you've got
|
||||
sed -i "s;WORDCOUNT;`cat $(SDIR)/chapters/*.tex | wc -w`;g" \
|
||||
$(BDIR)/$(TEMP)
|
||||
$(TDIR)/$(TEMP)
|
||||
|
||||
repo: mktemp
|
||||
sed -i "s;REPO;`git remote get-url origin`;g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;REPO;`git remote get-url origin`;g" $(TDIR)/$(TEMP)
|
||||
|
||||
title: mktemp
|
||||
sed -i "s;PROJECT;$(TITLE);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;PROJECT;$(TITLE);g" $(TDIR)/$(TEMP)
|
||||
|
||||
phone: mktemp
|
||||
sed -i "s;PHONE;$(PHONE);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;PHONE;$(PHONE);g" $(TDIR)/$(TEMP)
|
||||
|
||||
pen: mktemp
|
||||
sed -i "s;PENNAME;$(PENNAME);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;PENNAME;$(PENNAME);g" $(TDIR)/$(TEMP)
|
||||
# Change the following line's -f# to decide which name to use
|
||||
# LNAME needs to be the family name.
|
||||
sed -i "s;SNAME;`echo $(PENNAME) | cut -d" " -f2`;g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;SNAME;`echo $(PENNAME) | cut -d" " -f2`;g" $(TDIR)/$(TEMP)
|
||||
|
||||
email: mktemp
|
||||
sed -i "s;EMAIL;$(EMAIL);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;EMAIL;$(EMAIL);g" $(TDIR)/$(TEMP)
|
||||
|
||||
3ppn: mktemp
|
||||
sed -i "s;PRONOUNS;$(PRONOUNS);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;PRONOUNS;$(PRONOUNS);g" $(TDIR)/$(TEMP)
|
||||
|
||||
addr: mktemp
|
||||
sed -i "s;STREETADDR;$(STREETADDR);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;LASTADDR;$(LASTADDR);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;STREETADDR;$(STREETADDR);g" $(TDIR)/$(TEMP)
|
||||
sed -i "s;LASTADDR;$(LASTADDR);g" $(TDIR)/$(TEMP)
|
||||
|
||||
lname: mktemp
|
||||
sed -i "s;LEGALNAME;$(LEGALNAME);g" $(BDIR)/$(TEMP)
|
||||
sed -i "s;LEGALNAME;$(LEGALNAME);g" $(TDIR)/$(TEMP)
|
||||
|
||||
template: mktemp wordcount repo title phone pen email 3ppn addr lname
|
||||
if [ -f $(BDIR)/$(TEMP) ]; \
|
||||
then mv $(BDIR)/$(TEMP) $(BDIR)/$(SOURCE); \
|
||||
else cp $(SDIR)/$(SOURCE) $(BDIR)/$(SOURCE); \
|
||||
if [ -f $(TDIR)/$(TEMP) ]; \
|
||||
then mv $(TDIR)/$(TEMP) $(TDIR)/$(SOURCE); \
|
||||
else cp $(SDIR)/$(SOURCE) $(TDIR)/$(SOURCE); \
|
||||
fi
|
||||
|
||||
pdf: template
|
||||
pdflatex -jobname=$(BNAME) -output-directory=$(BDIR) $(BDIR)/$(SOURCE)
|
||||
pdflatex -jobname=$(BNAME) -output-directory=$(BDIR) $(TDIR)/$(SOURCE)
|
||||
|
||||
epub: template
|
||||
tex4ebook -f epub -c $(SDIR)/$(CONF) -j $(BNAME) $(BDIR)/$(SOURCE)
|
||||
tex4ebook -f epub -c $(SDIR)/$(CONF) -j $(BNAME) $(TDIR)/$(SOURCE)
|
||||
mv $(BNAME).epub $(BDIR)
|
||||
|
||||
word: template
|
||||
pandoc $(BDIR)/$(SOURCE) -o $(BDIR)/$(BNAME).docx
|
||||
pandoc $(TDIR)/$(SOURCE) -o $(BDIR)/$(BNAME).docx
|
||||
|
||||
spellcheck:
|
||||
for c in $(SDIR)/chapters/*.tex; do aspell -t -c $${c}; done
|
||||
|
|
@ -88,7 +90,7 @@ cleanbuild:
|
|||
rm -rf $(BDIR)/*.log $(BDIR)/*.aux $(BDIR)/*.toc $(BDIR)/$(TEMP) \
|
||||
$(BDIR)/$(SOURCE) ./*.opf ./*.html ./*.aux ./*.css ./*.dvi \
|
||||
./*-epub/ ./*-mobi/ ./*.idv ./*.lg ./*.log ./*.toc ./*.xref \
|
||||
./*.4ct ./*.4tc ./*.ncx ./*.tmp $(SDIR)/chapters/*.bak
|
||||
./*.4ct ./*.4tc ./*.ncx ./*.tmp $(SDIR)/chapters/*.bak $(TDIR)
|
||||
|
||||
clean: cleanbuild
|
||||
rm -rf $(BASEBDIR)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Vance was overall a good guy. Just trying to get things together and make sure
|
|||
|
||||
"Don't worry," another developer spoke up, "we'll give you the light load this week." Brent. Another good guy. Just sometimes really weird. Not like I could talk.
|
||||
|
||||
"Thank you," I said, genuinely, "I appreciate that, though if all aren't in agreement, I can take one of the other workloads." There were unanimous nods from all but one. Kaden. He's new. \emph{I should give him the benefit of% the doubt, shouldn't I?}
|
||||
"Thank you," I said, genuinely, "I appreciate that, though if all aren't in agreement, I can take one of the other workloads." There were unanimous nods from all but one. Kaden. He's new. \emph{I should give him the benefit of the doubt, shouldn't I?}
|
||||
|
||||
"Kaden!" another senior developer exclaimed, "Talon's just been having an off month. His code is top notch and beyond stellar. We should let him recover." A pang of pain shot through me. I wasn't sure why. I didn't know this developer's name, though he's certainly seen my code. He wasn't lying either. My code was top notch.
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ I could hear the dings of direct messages coming in. I pulled my head out from
|
|||
|
||||
I chuckled to myself slightly and clicked the link. The web browser opened to our issue tracker with a list of open issues. Only one was assigned to me.
|
||||
|
||||
\textbf{[OPEN] [Flight] [Debug] [Regression] Current Version not decoding data% correctly}
|
||||
\textbf{[OPEN] [Flight] [Debug] [Regression] Current Version not decoding data correctly}
|
||||
|
||||
I switched tabs to the version control software and counted the reviews I had to do. Three. Not bad. I can knock them out in an hour. Probably. If I don't break down crying or fall asleep.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue