Permalink
Browse files

Merge latest integration into gsharpe

  • Loading branch information...
sharpe
sharpe committed Mar 24, 2014
2 parents 9eefe1d + 9580b6c commit 9d14153b50b58653dd408168c97ab4aaaceb1122
Showing with 8,816 additions and 7,942 deletions.
  1. +8 −1 .gitignore
  2. +0 −1 000-branch-gsharpe
  3. +2 −0 CHANGES
  4. +26 −2 Makefile
  5. +93 −0 Rakefile
  6. +189 −189 bibfiles/oscNextActions.bib
  7. +57 −27 bibfiles/oscResourcesDe.bib
  8. +56 −26 bibfiles/oscResourcesEn.bib
  9. +6 −1 btexmat/oscBibDataCheckEn.tex
  10. +5 −0 btexmat/oscBibRevAllDe.tex
  11. +6 −1 btexmat/oscBibRevAllEn.tex
  12. +6 −1 btexmat/oscBibRevCopiedButNotRead.tex
  13. +6 −1 btexmat/oscBibRevNextAction.tex
  14. +5 −0 btexmat/oscBibRevResourcesDe.tex
  15. +6 −1 btexmat/oscBibRevResourcesEn.tex
  16. +4 −1 btexmat/oscHyphenationDeInc.tex
  17. +7 −2 btexmat/oscHyphenationEnInc.tex
  18. +5 −0 btexmat/oscJbibCfgDeInc.tex
  19. +5 −0 btexmat/oscJbibCfgEnInc.tex
  20. +125 −0 btexmat/oscJbibCfgEnIncNoAnno.tex
  21. +5 −0 btexmat/oscJbibCfgPureInc.tex
  22. +6 −1 btexmat/oscLicenseFootnoteInc.tex
  23. +4 −0 btexmat/oscLicenseHintInc.tex
  24. +6 −1 btexmat/oscNclAbbreviationsDeInc.tex
  25. +6 −1 btexmat/oscNclAbbreviationsEnInc.tex
  26. +4 −0 btexmat/oscNclJournalsInc.tex
  27. +1 −1 extracts/arlBriVol2004a.tex
  28. +1 −1 extracts/breGlaGra2008a.tex
  29. +1 −1 extracts/bruHarPicCreFieHen2004a.tex
  30. +1 −1 extracts/eckl2004a.tex
  31. +1 −1 extracts/euler2006a.tex
  32. +1 −1 extracts/ifross2005a.tex
  33. +1 −1 extracts/jaeMet2002a06a11a.tex
  34. +1 −1 extracts/kaes2008a.tex
  35. +1 −1 extracts/koglin2007a.tex
  36. +1 −1 extracts/kreutzer2008a.tex
  37. +1 −1 extracts/kreutzer2008b.tex
  38. +1 −1 extracts/kreutzer2008c.tex
  39. +1 −1 extracts/mundhenke2007a.tex
  40. +1 −1 extracts/oberhem2008a.tex
  41. +1 −1 extracts/renVetRexKet2005a.tex
  42. +1 −1 extracts/sebald2008a.tex
  43. +1 −1 extracts/seeKra2008a.tex
  44. +1 −1 extracts/spindler2004a.tex
  45. +1 −1 extracts/stallman1984a.tex
  46. +1 −1 extracts/stallman1994a.tex
  47. +1 −1 extracts/stallman1996a.tex
  48. +1 −1 extracts/stallman1996b.tex
  49. +1 −1 extracts/stallman1996c.tex
  50. +1 −1 extracts/stallman1998a.tex
  51. +1 −1 extracts/stallman1999a.tex
  52. +1 −1 extracts/stallman2000a.tex
  53. +1 −1 extracts/stallman2001a.tex
  54. +1 −1 extracts/stallman2002b.tex
  55. +1 −1 extracts/suchomski2011a.tex
  56. +1 −1 extracts/taubert2006a.tex
  57. +1 −1 extracts/viesel2006a.tex
  58. +1 −1 extracts/vwdjDebVEee2003a.tex
  59. +1 −1 extracts/widmer2003a.tex
  60. +1 −1 extracts/williams2002a.tex
  61. +79 −36 oslic.tex
  62. BIN presentations/20130308-oslic-on-cebit-os-forum-rel-1.0.0.pdf
  63. BIN presentations/20130315-oslic-on-chemnitzer-linuxdays-rel-1.0.0.pdf
  64. BIN presentations/20130405-oslic-on-ellw-fsfe-amsterdam-1.0.0-with-spoken-comments.pdf
  65. BIN presentations/20130405-oslic-on-ellw-fsfe-amsterdam-1.0.0.pdf
  66. BIN presentations/20130522-oslic-oscad-linuxday-lecture-with-spoken-comments.pdf
  67. BIN presentations/20130522-oslic-oscad-linuxday-lecture.pdf
  68. +1 −1 rel-number.tex
  69. +5 −0 snippets/20110905-LitCheckInc.tex
  70. +5 −0 snippets/20110912-TopicTopoi.tex
  71. +110 −101 snippets/en/01C-IntroductionInc.tex
  72. +908 −863 snippets/en/02C-SameIdeaDifferentLicenseModelsInc.tex
  73. +4 −2 snippets/en/03C-ImportantMinorPointsInc.tex
  74. +410 −306 snippets/en/03C-osImportantMinorPoints/0301-osAndPatentsInc.tex
  75. +96 −84 snippets/en/03C-osImportantMinorPoints/0302-noLinkDataInc.tex
  76. +181 −68 snippets/en/03C-osImportantMinorPoints/0303-derivativeWorksInc.tex
  77. +11 −5 snippets/en/03C-osImportantMinorPoints/0304-licenseCompatibilityInc.tex
  78. +5 −0 snippets/en/03C-osImportantMinorPoints/0305-osAndMoneyInc.tex
  79. +169 −288 snippets/en/04C-OsucConceptAndTaxonomyInc.tex
  80. +306 −815 snippets/en/05C-OsToDoListFinderInc.tex
  81. +33 −7 snippets/en/06C-OsFulfillmentByToDoListsInc.tex
  82. +5 −0 snippets/en/06C-osFulfillmentByToDoLists/0601-agplFulfillToDoList.tex
  83. +431 −487 snippets/en/06C-osFulfillmentByToDoLists/0602-apacheFulfillToDoList.tex
  84. +625 −437 snippets/en/06C-osFulfillmentByToDoLists/0603-bsdFulfillToDoList.tex
  85. +527 −672 snippets/en/06C-osFulfillmentByToDoLists/0604-eplFulfillToDoList.tex
  86. +526 −725 snippets/en/06C-osFulfillmentByToDoLists/0605-euplFulfillToDoList.tex
  87. +982 −880 snippets/en/06C-osFulfillmentByToDoLists/0606-gplFulfillToDoList.tex
  88. +66 −53 snippets/en/06C-osFulfillmentByToDoLists/0607-lgplFulfillToDoList.tex
  89. +245 −219 snippets/en/06C-osFulfillmentByToDoLists/0608-mitFulfillToDoList.tex
  90. +479 −657 snippets/en/06C-osFulfillmentByToDoLists/0609-mplFulfillToDoList.tex
  91. +272 −248 snippets/en/06C-osFulfillmentByToDoLists/0610-msplFulfillToDoList.tex
  92. +275 −241 snippets/en/06C-osFulfillmentByToDoLists/0611-pglFulfillToDoList.tex
  93. +365 −388 snippets/en/06C-osFulfillmentByToDoLists/0612-phpFulfillToDoList.tex
  94. +15 −10 snippets/en/06C-osFulfillmentByToDoLists/0613-cddlFulfillToDoList.tex
  95. +5 −0 snippets/en/07C-LegalEnvironmentsInc.tex
  96. +5 −0 snippets/en/08C-ConclusionInc.tex
  97. +11 −6 snippets/en/09C-Appendices/0901-BiblioHintInc.tex
  98. +15 −10 snippets/en/09C-Appendices/0902-MythsOfOsInc.tex
  99. +7 −2 snippets/en/09C-Appendices/0903-ProlegomenaInc.tex
  100. +23 −3 snippets/en/20110928-Changes.tex
  101. +24 −19 snippets/en/20120222-DisclaimerInc.tex
  102. +21 −14 snippets/en/20130415-Missed.tex
  103. +6 −1 snippets/oscSnippetFrame.tex
  104. +5 −0 snippets/oscSnippetInc.tex
  105. +5 −0 snippets/oscUbLitRecherche.tex
  106. +5 −0 templates/oscBibDataCheckDe.tex
  107. +6 −1 templates/oscBibDataCheckEn.tex
  108. +6 −1 templates/oscExtractTplDe.tex
  109. +6 −1 templates/oscExtractTplEn.tex
  110. +1 −0 to_oscad/.gitignore
  111. +74 −0 to_oscad/oscad-1-templates/lsuc-master.erb
  112. +27 −0 to_oscad/oscad-1-templates/osuc-master.erb
  113. +65 −0 to_oscad/oscad-1-templates/use-case-matrix.erb
  114. +169 −0 to_oscad/oscad.sty
  115. +404 −0 to_oscad/oslic.rb
  116. +108 −0 to_oscad/to_oscad.rb
View
@@ -11,4 +11,11 @@
.DS_Store
.project
.texlipse
-
+/tmp
+/000-branch-*
+/oscad.xml
+/oslic.nlo
+/oslic.nls
+/oslic.out
+/oslic.pdf
+/oslic-*.pdf
View
@@ -1 +0,0 @@
-flag file for indicating which branch is used
View
@@ -1,3 +1,5 @@
+2014-01-13:
+* change to pdfLatex
2013-07-28:
* LGPL specific finder improved
* Default version set to English (oslic-en-*.* => oslic-*.*)
View
@@ -1,42 +1,66 @@
# (c) Karsten Reincke, Frankfurt am Main, 2011
# compile one/all tex-files
+LATEX=pdflatex
+
AUX_EXTS=url bbl blg aux dvi toc log lof nlo nls ilg ils ent
RES_EXTS=ps pdf bak rtf
SUB_DIRS=bibfiles btexmat extracts snippets templates
OSLICDIR=oslic
all: advi
+ifneq ($(LATEX),pdflatex)
advi: clear
find . -maxdepth 1 -name "*.tex" -type f ! -name "rel*.tex"|\
while read file; do \
make "`basename $$file .tex`.dvi";\
done
aps: clear
- find . -maxdepth 1 -name "*.tex" -type f - name "rel*.tex"|\
+ find . -maxdepth 1 -name "*.tex" -type f ! -name "rel*.tex"|\
while read file; do \
make "`basename $$file .tex`.ps";\
done
+endif
apdf: clear
- find . -maxdepth 1 -name "*.tex" -type f -name "rel*.tex"|\
+ find . -maxdepth 1 -name "*.tex" -type f ! -name "rel*.tex"|\
while read file; do \
make "`basename $$file .tex`.pdf";\
done
+ifneq ($(LATEX),pdflatex)
ddvi: advi
$(foreach DIR, ${SUB_DIRS}, cd ${DIR} && make advi && cd ..; done)
dps: aps
$(foreach DIR, ${SUB_DIRS}, cd ${DIR} && make aps && cd ..; done)
+endif
dpdf: apdf
$(foreach DIR, ${SUB_DIRS}, cd ${DIR} && make apdf && cd ..; done)
.SUFFIXES: .tex .dvi .ps .pdf .rtf
+
+.tex.pdf:
+ @ echo "### `date +'%Y%m%dT%H%M%S'`"
+ @ echo "### converting $< to $@"
+ @ $(LATEX) $<
+ @ bibtex `basename $< .tex`
+ @ makeindex `basename $< .tex`.nlo -s btexmat/nomencl.ist -o `basename $< .tex`.nls
+ @ $(LATEX) $<
+ @ $(LATEX) $<
+ @ $(LATEX) $<
+ifneq ($(LATEX),pdflatex)
+ @ echo "### converting DVI to PostScript"
+ @ dvips $<
+ @ echo "### converting PostScript to PDF"
+ @ ps2pdf $<
+endif
+ @ mv $@ `basename $@ .pdf`-`cat rel-number.tex`.pdf
+
.tex.dvi:
@ echo "### `date +'%Y%m%dT%H%M%S'`"
@ echo "### converting $< to $@"
View
@@ -0,0 +1,93 @@
+# ------------------------------------------------------------------------------
+# Rake build script for oslic
+# ------------------------------------------------------------------------------
+
+require 'find'
+
+VERSION_NUMBER = IO.read("rel-number.tex").chomp
+
+PROTECTED_DIRS=%w{license presentations}
+AUX_EXTS=%w{url bbl blg aux dvi toc log lof nlo nls ilg ils ent out}
+RES_EXTS=%w{ps pdf rtf} + AUX_EXTS
+
+DIR_REGEX=%r{^(\./)?#{PROTECTED_DIRS.join('|')}}
+AUX_REGEX=%r{\.(#{AUX_EXTS.join('|')})$}
+RES_REGEX=%r{\.(#{RES_EXTS.join('|')})$}
+
+# ------------------------------------------------------------------------------
+# Utilities for manipulating file names
+# ------------------------------------------------------------------------------
+
+def replace_ext(filename, new_ext)
+ filename.sub(/#{File.extname(filename)}$/, new_ext)
+end
+
+def no_ext(filename)
+ replace_ext(filename, "")
+end
+
+
+# ------------------------------------------------------------------------------
+# Commands used in this file
+# ------------------------------------------------------------------------------
+
+def latex(filename)
+ sh "pdflatex #{no_ext(filename)}"
+end
+
+def make_bib_and_index(filename)
+ index_input = replace_ext(filename, '.nlo')
+ index_output = replace_ext(filename, '.nls')
+ sh "bibtex #{no_ext(filename)}"
+ sh "makeindex #{index_input} -s btexmat/nomencl.ist -o #{index_output}"
+end
+
+def fast_build(filename)
+ basename = no_ext(filename)
+ latex filename
+ cp "#{basename}.pdf", "#{basename}-#{VERSION_NUMBER}.pdf"
+end
+
+# filename - name of the LaTeX file, w/ or w/o extension
+#
+def full_build(filename)
+ latex filename
+ make_bib_and_index filename
+ latex filename
+ fast_build filename
+end
+
+def remove_files
+ Find.find(".") do |f|
+ if yield(f) then
+ rm f
+ end
+ end
+end
+
+# ------------------------------------------------------------------------------
+# Tasks
+# ------------------------------------------------------------------------------
+
+task :clean do
+ remove_files { |file| not(file =~ DIR_REGEX) && AUX_REGEX =~ file }
+end
+
+task :distclean do
+ remove_files { |file| not(file=~ DIR_REGEX) && RES_REGEX =~ file }
+ rm "oslic.pdf"
+end
+
+task :build do
+ full_build "oslic"
+end
+
+task "oslic.pdf" do
+ fast_build "oslic"
+end
+
+# ------------------------------------------------------------------------------
+# Local Variables:
+# mode: ruby
+# End:
+# ------------------------------------------------------------------------------
Oops, something went wrong.

0 comments on commit 9d14153

Please sign in to comment.