diff options
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | doc/.footer.md | 3 | ||||
-rw-r--r-- | doc/.header.md | 12 | ||||
-rw-r--r-- | docs/icon.png (renamed from doc/icon.png) | bin | 1565 -> 1565 bytes | |||
-rw-r--r-- | docs/images/adeptsense_doc.png (renamed from doc/images/adeptsense_doc.png) | bin | 31077 -> 31077 bytes | |||
-rw-r--r-- | docs/images/adeptsense_lua.png (renamed from doc/images/adeptsense_lua.png) | bin | 6099 -> 6099 bytes | |||
-rw-r--r-- | docs/images/adeptsense_string.png (renamed from doc/images/adeptsense_string.png) | bin | 5763 -> 5763 bytes | |||
-rw-r--r-- | docs/images/adeptsense_ta.png (renamed from doc/images/adeptsense_ta.png) | bin | 75001 -> 75001 bytes | |||
-rw-r--r-- | docs/images/adeptsense_tadoc.png (renamed from doc/images/adeptsense_tadoc.png) | bin | 53376 -> 53376 bytes | |||
-rw-r--r-- | docs/images/bufferbrowser.png (renamed from doc/images/bufferbrowser.png) | bin | 68457 -> 68457 bytes | |||
-rw-r--r-- | docs/images/bufferbrowserfiltered.png (renamed from doc/images/bufferbrowserfiltered.png) | bin | 34057 -> 34057 bytes | |||
-rw-r--r-- | docs/images/commandentry.png (renamed from doc/images/commandentry.png) | bin | 6976 -> 6976 bytes | |||
-rw-r--r-- | docs/images/commandentrycompletion.png (renamed from doc/images/commandentrycompletion.png) | bin | 5802 -> 5802 bytes | |||
-rw-r--r-- | docs/images/darktheme.png (renamed from doc/images/darktheme.png) | bin | 35215 -> 35215 bytes | |||
-rw-r--r-- | docs/images/docstatusbar.png (renamed from doc/images/docstatusbar.png) | bin | 3340 -> 3340 bytes | |||
-rw-r--r-- | docs/images/feed.png (renamed from doc/images/feed.png) | bin | 1737 -> 1737 bytes | |||
-rw-r--r-- | docs/images/findinfiles.png (renamed from doc/images/findinfiles.png) | bin | 117944 -> 117944 bytes | |||
-rw-r--r-- | docs/images/folding.png (renamed from doc/images/folding.png) | bin | 34954 -> 34954 bytes | |||
-rw-r--r-- | docs/images/header.png (renamed from doc/images/header.png) | bin | 104022 -> 104022 bytes | |||
-rw-r--r-- | docs/images/icon.png (renamed from doc/images/icon.png) | bin | 2414 -> 2414 bytes | |||
-rw-r--r-- | docs/images/lighttheme.png (renamed from doc/images/lighttheme.png) | bin | 36838 -> 36838 bytes | |||
-rw-r--r-- | docs/images/linux.png (renamed from doc/images/linux.png) | bin | 13489 -> 13489 bytes | |||
-rw-r--r-- | docs/images/macosx.png (renamed from doc/images/macosx.png) | bin | 13630 -> 13630 bytes | |||
-rw-r--r-- | docs/images/matchingbrace.png (renamed from doc/images/matchingbrace.png) | bin | 7814 -> 7814 bytes | |||
-rw-r--r-- | docs/images/ncurses.png (renamed from doc/images/ncurses.png) | bin | 9773 -> 9773 bytes | |||
-rw-r--r-- | docs/images/rectangularselection.png (renamed from doc/images/rectangularselection.png) | bin | 2270 -> 2270 bytes | |||
-rw-r--r-- | docs/images/rectangularselection2.png (renamed from doc/images/rectangularselection2.png) | bin | 2473 -> 2473 bytes | |||
-rw-r--r-- | docs/images/runerror.png (renamed from doc/images/runerror.png) | bin | 39951 -> 39951 bytes | |||
-rw-r--r-- | docs/images/snapopen.png (renamed from doc/images/snapopen.png) | bin | 71649 -> 71649 bytes | |||
-rw-r--r-- | docs/images/snippet.png (renamed from doc/images/snippet.png) | bin | 905 -> 905 bytes | |||
-rw-r--r-- | docs/images/snippet2.png (renamed from doc/images/snippet2.png) | bin | 5332 -> 5332 bytes | |||
-rw-r--r-- | docs/images/splitviews.png (renamed from doc/images/splitviews.png) | bin | 124605 -> 124605 bytes | |||
-rw-r--r-- | docs/images/termtheme.png (renamed from doc/images/termtheme.png) | bin | 22261 -> 22261 bytes | |||
-rw-r--r-- | docs/images/textadept.gif (renamed from doc/images/textadept.gif) | bin | 95466 -> 95466 bytes | |||
-rw-r--r-- | docs/images/textadept.png (renamed from doc/images/textadept.png) | bin | 18735 -> 18735 bytes | |||
-rw-r--r-- | docs/images/ui.png (renamed from doc/images/ui.png) | bin | 110266 -> 110266 bytes | |||
-rw-r--r-- | docs/images/win32.png (renamed from doc/images/win32.png) | bin | 12479 -> 12479 bytes | |||
-rw-r--r-- | docs/images/wordcompletion.png (renamed from doc/images/wordcompletion.png) | bin | 3996 -> 3996 bytes | |||
-rw-r--r-- | docs/images/wordhighlight.png (renamed from doc/images/wordhighlight.png) | bin | 57499 -> 57499 bytes | |||
-rw-r--r-- | docs/index.html (renamed from doc/index.html) | 4 | ||||
-rw-r--r-- | docs/manual.md (renamed from doc/manual.md) | 0 | ||||
-rw-r--r-- | docs/markdowndoc.lua (renamed from doc/markdowndoc.lua) | 0 | ||||
-rw-r--r-- | docs/style.css | 98 | ||||
-rw-r--r-- | modules/lua/ta_api | 2 | ||||
-rw-r--r-- | modules/textadept/menu.lua | 4 | ||||
-rwxr-xr-x | scripts/gen_doc.lua | 11 | ||||
-rw-r--r-- | src/Makefile | 34 |
47 files changed, 132 insertions, 40 deletions
@@ -45,13 +45,13 @@ modules that provide extra features and functionality to the core application. ## Installation and Usage -Textadept comes with a comprehensive user manual in its *doc/* directory. This +Textadept comes with a comprehensive user manual in its *docs/* directory. This manual is also available [online][1]. It covers all of Textadept's main features, including installation, usage, configuration, theming, scripting, and compilation. Since nearly every aspect of Textadept can be scripted using Lua, the editor's -API is heavily documented. This documentation is also located in *doc/* and +API is heavily documented. This documentation is also located in *docs/* and available [online][2]. It serves as the ultimate resource when it comes to scripting the application. diff --git a/doc/.footer.md b/doc/.footer.md deleted file mode 100644 index fa00ac9a..00000000 --- a/doc/.footer.md +++ /dev/null @@ -1,3 +0,0 @@ --> (c) 2007-2020 [Mitchell][] mitchell.att.foicica.com <- - -[Mitchell]: http://foicica.com diff --git a/doc/.header.md b/doc/.header.md deleted file mode 100644 index 4a0e2097..00000000 --- a/doc/.header.md +++ /dev/null @@ -1,12 +0,0 @@ -# ![](images/icon.png) Textadept - -* [Home](index.html) | -* [Download](http://foicica.com/textadept/download) | -* [Book](MEDIA.html#book) | -* [Manual](manual.html) | -* [API](api.html) | -* [Source](http://foicica.com/hg/textadept) | -* [Language Modules](http://foicica.com/hg/textadept_modules) | -* [Stats](http://foicica.com/stats.html#Textadept) | -* [Wiki](http://foicica.com/wiki/textadept) | -* [Mailing List](http://foicica.com/lists) diff --git a/doc/icon.png b/docs/icon.png Binary files differindex a2d21704..a2d21704 100644 --- a/doc/icon.png +++ b/docs/icon.png diff --git a/doc/images/adeptsense_doc.png b/docs/images/adeptsense_doc.png Binary files differindex d484aac0..d484aac0 100644 --- a/doc/images/adeptsense_doc.png +++ b/docs/images/adeptsense_doc.png diff --git a/doc/images/adeptsense_lua.png b/docs/images/adeptsense_lua.png Binary files differindex 1d7503ab..1d7503ab 100644 --- a/doc/images/adeptsense_lua.png +++ b/docs/images/adeptsense_lua.png diff --git a/doc/images/adeptsense_string.png b/docs/images/adeptsense_string.png Binary files differindex 2515dafb..2515dafb 100644 --- a/doc/images/adeptsense_string.png +++ b/docs/images/adeptsense_string.png diff --git a/doc/images/adeptsense_ta.png b/docs/images/adeptsense_ta.png Binary files differindex 8d013b17..8d013b17 100644 --- a/doc/images/adeptsense_ta.png +++ b/docs/images/adeptsense_ta.png diff --git a/doc/images/adeptsense_tadoc.png b/docs/images/adeptsense_tadoc.png Binary files differindex fe0effad..fe0effad 100644 --- a/doc/images/adeptsense_tadoc.png +++ b/docs/images/adeptsense_tadoc.png diff --git a/doc/images/bufferbrowser.png b/docs/images/bufferbrowser.png Binary files differindex d58c5008..d58c5008 100644 --- a/doc/images/bufferbrowser.png +++ b/docs/images/bufferbrowser.png diff --git a/doc/images/bufferbrowserfiltered.png b/docs/images/bufferbrowserfiltered.png Binary files differindex 5d022b7c..5d022b7c 100644 --- a/doc/images/bufferbrowserfiltered.png +++ b/docs/images/bufferbrowserfiltered.png diff --git a/doc/images/commandentry.png b/docs/images/commandentry.png Binary files differindex 6cf4921c..6cf4921c 100644 --- a/doc/images/commandentry.png +++ b/docs/images/commandentry.png diff --git a/doc/images/commandentrycompletion.png b/docs/images/commandentrycompletion.png Binary files differindex ed234fa7..ed234fa7 100644 --- a/doc/images/commandentrycompletion.png +++ b/docs/images/commandentrycompletion.png diff --git a/doc/images/darktheme.png b/docs/images/darktheme.png Binary files differindex 6e4d0b12..6e4d0b12 100644 --- a/doc/images/darktheme.png +++ b/docs/images/darktheme.png diff --git a/doc/images/docstatusbar.png b/docs/images/docstatusbar.png Binary files differindex 3e096781..3e096781 100644 --- a/doc/images/docstatusbar.png +++ b/docs/images/docstatusbar.png diff --git a/doc/images/feed.png b/docs/images/feed.png Binary files differindex d64c669c..d64c669c 100644 --- a/doc/images/feed.png +++ b/docs/images/feed.png diff --git a/doc/images/findinfiles.png b/docs/images/findinfiles.png Binary files differindex 597ea6be..597ea6be 100644 --- a/doc/images/findinfiles.png +++ b/docs/images/findinfiles.png diff --git a/doc/images/folding.png b/docs/images/folding.png Binary files differindex 7eb6d87d..7eb6d87d 100644 --- a/doc/images/folding.png +++ b/docs/images/folding.png diff --git a/doc/images/header.png b/docs/images/header.png Binary files differindex aaf5b55d..aaf5b55d 100644 --- a/doc/images/header.png +++ b/docs/images/header.png diff --git a/doc/images/icon.png b/docs/images/icon.png Binary files differindex 5345a254..5345a254 100644 --- a/doc/images/icon.png +++ b/docs/images/icon.png diff --git a/doc/images/lighttheme.png b/docs/images/lighttheme.png Binary files differindex c3ab49bb..c3ab49bb 100644 --- a/doc/images/lighttheme.png +++ b/docs/images/lighttheme.png diff --git a/doc/images/linux.png b/docs/images/linux.png Binary files differindex 28789bb8..28789bb8 100644 --- a/doc/images/linux.png +++ b/docs/images/linux.png diff --git a/doc/images/macosx.png b/docs/images/macosx.png Binary files differindex f434746d..f434746d 100644 --- a/doc/images/macosx.png +++ b/docs/images/macosx.png diff --git a/doc/images/matchingbrace.png b/docs/images/matchingbrace.png Binary files differindex 52ca30d2..52ca30d2 100644 --- a/doc/images/matchingbrace.png +++ b/docs/images/matchingbrace.png diff --git a/doc/images/ncurses.png b/docs/images/ncurses.png Binary files differindex 2350fe28..2350fe28 100644 --- a/doc/images/ncurses.png +++ b/docs/images/ncurses.png diff --git a/doc/images/rectangularselection.png b/docs/images/rectangularselection.png Binary files differindex 4506a41d..4506a41d 100644 --- a/doc/images/rectangularselection.png +++ b/docs/images/rectangularselection.png diff --git a/doc/images/rectangularselection2.png b/docs/images/rectangularselection2.png Binary files differindex 9c081648..9c081648 100644 --- a/doc/images/rectangularselection2.png +++ b/docs/images/rectangularselection2.png diff --git a/doc/images/runerror.png b/docs/images/runerror.png Binary files differindex 4fe89b53..4fe89b53 100644 --- a/doc/images/runerror.png +++ b/docs/images/runerror.png diff --git a/doc/images/snapopen.png b/docs/images/snapopen.png Binary files differindex 304e3c9b..304e3c9b 100644 --- a/doc/images/snapopen.png +++ b/docs/images/snapopen.png diff --git a/doc/images/snippet.png b/docs/images/snippet.png Binary files differindex c4f28c24..c4f28c24 100644 --- a/doc/images/snippet.png +++ b/docs/images/snippet.png diff --git a/doc/images/snippet2.png b/docs/images/snippet2.png Binary files differindex da711385..da711385 100644 --- a/doc/images/snippet2.png +++ b/docs/images/snippet2.png diff --git a/doc/images/splitviews.png b/docs/images/splitviews.png Binary files differindex d9a4060d..d9a4060d 100644 --- a/doc/images/splitviews.png +++ b/docs/images/splitviews.png diff --git a/doc/images/termtheme.png b/docs/images/termtheme.png Binary files differindex 00c43ac1..00c43ac1 100644 --- a/doc/images/termtheme.png +++ b/docs/images/termtheme.png diff --git a/doc/images/textadept.gif b/docs/images/textadept.gif Binary files differindex 86a05264..86a05264 100644 --- a/doc/images/textadept.gif +++ b/docs/images/textadept.gif diff --git a/doc/images/textadept.png b/docs/images/textadept.png Binary files differindex a1e4a772..a1e4a772 100644 --- a/doc/images/textadept.png +++ b/docs/images/textadept.png diff --git a/doc/images/ui.png b/docs/images/ui.png Binary files differindex 8bd1b6ea..8bd1b6ea 100644 --- a/doc/images/ui.png +++ b/docs/images/ui.png diff --git a/doc/images/win32.png b/docs/images/win32.png Binary files differindex 78c49e97..78c49e97 100644 --- a/doc/images/win32.png +++ b/docs/images/win32.png diff --git a/doc/images/wordcompletion.png b/docs/images/wordcompletion.png Binary files differindex d2ca7cf3..d2ca7cf3 100644 --- a/doc/images/wordcompletion.png +++ b/docs/images/wordcompletion.png diff --git a/doc/images/wordhighlight.png b/docs/images/wordhighlight.png Binary files differindex c8d37e30..c8d37e30 100644 --- a/doc/images/wordhighlight.png +++ b/docs/images/wordhighlight.png diff --git a/doc/index.html b/docs/index.html index 6b4afaad..435d3f18 100644 --- a/doc/index.html +++ b/docs/index.html @@ -235,7 +235,7 @@ <h3>Comprehensive Manual</h3> <p> Textadept comes with a comprehensive user manual in the - application’s <em>doc/</em> directory. This manual is also + application’s <em>docs/</em> directory. This manual is also available <a href="manual.html">online</a>. It covers all of Textadept’s main features, including installation, usage, configuration, theming, scripting, and compilation. @@ -245,7 +245,7 @@ <h3>Exhaustive API Documentation</h3> <p> Since Textadept is entirely scriptable with Lua, its API is heavily - documented. This documentation is also located in <em>doc/</em>, is + documented. This documentation is also located in <em>docs/</em>, is available <a href="api.html">online</a>, and is the ultimate resource on scripting Textadept. (The editor’s Lua internals also provide abundant scripting examples.) diff --git a/doc/manual.md b/docs/manual.md index d4061b39..d4061b39 100644 --- a/doc/manual.md +++ b/docs/manual.md diff --git a/doc/markdowndoc.lua b/docs/markdowndoc.lua index d8f5b186..d8f5b186 100644 --- a/doc/markdowndoc.lua +++ b/docs/markdowndoc.lua diff --git a/docs/style.css b/docs/style.css new file mode 100644 index 00000000..aede8b9b --- /dev/null +++ b/docs/style.css @@ -0,0 +1,98 @@ +/* Copyright 2012-2020 Mitchell mitchell.att.foicica.com. */ + +* { + border: 0 solid #a6a6a6; + margin: 0; + padding: 0; +} + +a { + color: #1a66b3; + text-decoration: none; +} +a:hover { text-decoration: underline; } +a:visited { color: #661a66; } + +body { + background-color: #f2f2f2; + color: #333333; +} + +code { font-size: 1.2em; } + +del { color: #994d4d; } + +h1 { margin: 0 0 1em 0; } +h2, h3, h4, h5, h6 { margin: 1em 0 1em 0; } +h1 { font-size: 1.3em; } +h2 { font-size: 1.1em; } +h3 { font-size: 1em; } +h4 { font-size: 0.9em; } +h5 { font-size: 0.8em; } + +hr { + border: 1px solid #d9d9d9; + border-width: 1px 0 0 0; + margin: 1em 0 1em 0; +} + +input, textarea { + border-width: 1px; + font-size: 1em; +} + +ins { color: #4d994d; } + +li > code, p > code, em > code, td > code { color: #808080; } + +pre { + color: #808080; + margin: 0 2.5em 0 2.5em; + white-space: pre-wrap; +} + +table, th, td { + border-width: 1px; + border-collapse: collapse; + margin-left: 1em; + padding: 0.25em; +} + +#content { + border-width: 0 1px 0 1px; + font-size: 1.2em; + margin: 0 auto 0 auto; + max-width: 1000px; +} + +#header h1 { + background-color: #d9d9d9; + border-width: 0 0 1px 0; + margin: 0; + padding: 0.25em; +} +#header img { vertical-align: text-bottom; } +#header ul, #header p { + border-width: 0 0 1px 0; + margin-bottom: 1.5em; + padding: 0.25em; +} +#header ul { list-style: none; } +#header li { + color: #808080; + display: inline; +} +#header li form { display: inline; } + +#main { margin-left: 1em; } +#main dl, #main p { margin: 1em; } +#main dd, #main ol, #main ul { margin-left: 2.5em; } +#main ol p, #main ul p { margin-left: 0; } + +#footer { + background-color: #d9d9d9; + border-width: 1px 0 1px 0; + clear: both; + padding: 0.25em; + margin-top: 1.5em; +} diff --git a/modules/lua/ta_api b/modules/lua/ta_api index 93576dfc..1f31cc2e 100644 --- a/modules/lua/ta_api +++ b/modules/lua/ta_api @@ -632,7 +632,7 @@ handle_stdout Server:handle_stdout(output)\nProcesses unsolicited, incoming stdo height ui.command_entry.height (number)\nThe height in pixels of the command entry. hex_num lexer.hex_num (pattern)\nA pattern that matches a hexadecimal number. hide_lines view.hide_lines(view, start_line, end_line)\nHides the range of lines between line numbers *start_line* to *end_line*.\nThis has no effect on fold levels or fold flags and the first line cannot be\nhidden.\n@param view A view.\n@param start_line The start line of the range of lines in *view* to hide.\n@param end_line The end line of the range of lines in *view* to hide. -highlight_all_matches ui.find.highlight_all_matches (boolean)\nWhether or not to highlight all occurrences of found text in the current\nbuffer.\nThe default value is `true`. +highlight_all_matches ui.find.highlight_all_matches (boolean)\nWhether or not to highlight all occurrences of found text in the current\nbuffer.\nThe default value is `false`. highlight_guide view.highlight_guide (number)\nThe indentation guide column number to also highlight when highlighting\nmatching braces, or `0` to stop indentation guide highlighting. highlight_words textadept.editing.highlight_words (number)\nThe word highlight mode.\n\n* `textadept.editing.HIGHLIGHT_CURRENT`\n Automatically highlight all instances of the current word.\n* `textadept.editing.HIGHLIGHT_SELECTED`\n Automatically highlight all instances of the selected word.\n* `textadept.editing.HIGHLIGHT_NONE`\n Do not automatically highlight words.\n\nThe default value is `textadept.editing.HIGHLIGHT_NONE`. history _G.history (module)\n[Experimental]\nRecords buffer positions within Textadept views over time and allows for\nnavigating through that history.\n\nThis module is not loaded by default. `require('history')` must be called\nfrom *~/.textadept/init.lua*.\n\nBy default, this module listens for text edit events, and each time an\ninsertion or deletion occurs, its location is appended to the current view's\nlocation history. If the edit is close enough to the previous record, the\nprevious record is amended. diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua index 198dda73..6812b062 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -334,8 +334,8 @@ local default_menubar = { }, { title = _L['Help'], - {_L['Show Manual'], function() open_page(_HOME .. '/doc/manual.html') end}, - {_L['Show LuaDoc'], function() open_page(_HOME .. '/doc/api.html') end}, + {_L['Show Manual'], function() open_page(_HOME .. '/docs/manual.html') end}, + {_L['Show LuaDoc'], function() open_page(_HOME .. '/docs/api.html') end}, SEPARATOR, {_L['About'], function() ui.dialogs.msgbox{ diff --git a/scripts/gen_doc.lua b/scripts/gen_doc.lua new file mode 100755 index 00000000..1d317935 --- /dev/null +++ b/scripts/gen_doc.lua @@ -0,0 +1,11 @@ +#!/usr/bin/lua +-- Part of a pipeline that fills in simple {{ variable }} templates when +-- generating documentation offline. +-- cat file.md | markdown | gen_doc > file.html + +local html = io.read('*a') +local f = io.open('../docs/_layouts/default.html') +io.write( + f:read('*a'):gsub('{{ page.title }}', html:match('<h%d>([^<]+)')): + gsub('{{ content }}', (html:gsub('%%', '%%%%')))) +f:close() diff --git a/src/Makefile b/src/Makefile index c10c0a06..bd49890c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -238,7 +238,7 @@ textadept-curses.exe: $(sci_objs) $(sci_lex_objs) LexLPeg-curses.o \ # Install/uninstall. -install: $(install_targets) | ../core ../doc ../init.lua ../lexers ../LICENSE \ +install: $(install_targets) | ../core ../docs ../init.lua ../lexers ../LICENSE \ ../modules ../themes install -d $(DESTDIR)$(bin_dir) $(DESTDIR)$(data_dir) install $^ $(DESTDIR)$(data_dir) @@ -269,17 +269,18 @@ clean: ; rm -f *.o ../textadept* ta_home = $(shell dirname `pwd`) -doc: manual luadoc -manual: ../*.md ../doc/manual.md | ../doc/bombay - $| -d ../doc -t ../doc --title Textadept $^ - sed -i -e "s/manual - Textadept/Textadept $(subst _, ,$(version)) Manual/;" \ - ../doc/manual.html +docs: manual luadoc +manual: ../*.md ../docs/manual.md + for file in $^; do \ + markdown $$file | ../scripts/gen_doc.lua > \ + ../docs/`basename $$file .md`.html; \ + done sed -i -e "s/Textadept Manual/Textadept $(subst _, ,$(version)) Manual/;" \ - ../doc/manual.html + ../docs/manual.html luadoc: ../modules ../core ../lexers/lexer.lua | ../modules/lua/lua.luadoc - cd ../doc && luadoc -d . -t . --doclet markdowndoc $^ + cd ../docs && luadoc -d . -t . --doclet markdowndoc $^ sed -i -e "s/Textadept API/Textadept $(subst _, ,$(version)) API/;" \ - ../doc/api.html + ../docs/api.html cd ../modules && luadoc -d lua --doclet lua/tadoc $^ --ta-home=$(ta_home) cd ../modules/lua && mv tags ta_tags && mv api ta_api cd ../modules && luadoc -d lua --doclet lua/tadoc $| --ta-home=$(ta_home) @@ -315,14 +316,14 @@ endif $(basedir).linux: ; $(call archive,$@) release: $(basedir).linux - make deps clean doc sign-deps + make deps clean docs sign-deps PKG_CONFIG_PATH=/opt/gtk64/lib/pkgconfig make -j4 CFLAGS="$(CFLAGS) -m64" \ CXXFLAGS="$(CXXFLAGS) -m64 -static-libstdc++" make -j4 CFLAGS="$(CFLAGS) -m64" \ CXXFLAGS="$(CXXFLAGS) -m64 -static-libstdc++" \ CURSES_CFLAGS=-I/opt/ncursesw64/include/ncursesw \ CURSES_LIBS="-L/opt/ncursesw64/lib -lncursesw" curses - cp -rL ../doc ../lexers ../textadept* $< && cp *.asc $</src + cp -rL ../docs ../lexers ../textadept* $< && cp *.asc $</src tar czf $<.tgz $< && rm -rf $< && gpg --batch -ab $<.tgz $(basedir).win32: ; $(call archive,$@) win32-release: $(basedir).win32 @@ -332,7 +333,7 @@ win32-release: $(basedir).win32 rm -r $</lib/*.a $</lib/glib-2.0 $</lib/gtk-2.0/include $</lib/pkgconfig make -j4 win32 make -j4 win32-curses - cp -rL ../doc ../lexers ../textadept* $< + cp -rL ../docs ../lexers ../textadept* $< cp *.asc $</src zip -r $<.zip $< && rm -rf $< && gpg --batch -ab $<.zip $(basedir).macOS: ; mkdir $@ && cp ../scripts/osx/ta $@ @@ -355,7 +356,7 @@ osx-app: ../textadept ../textadept-curses ../scripts/osx/textadept_osx cp Info.plist $(osxapp_bin)/../ cp $^ $(osxapp_bin)/ $(call archive,$(osxapp_res)) - cp -rL ../doc ../lexers $(osxapp_res) && cp *.asc $(osxapp_res)/src + cp -rL ../docs ../lexers $(osxapp_res) && cp *.asc $(osxapp_res)/src mv $(osxapp_res)/core/images/textadept.icns $(osxapp_res)/ cp -r gtkosx/etc gtkosx/share $(osxapp_res)/ && mkdir $(osxapp_res)/lib/ cp -r $(addprefix gtkosx/lib/, $(osxapp_libs)) $(osxapp_res)/lib/ @@ -364,7 +365,7 @@ osx-app: ../textadept ../textadept-curses ../scripts/osx/textadept_osx # External dependencies. -base_deps = scintilla ../lexers lua lualibs gtdialog cdk ../doc/bombay +base_deps = scintilla ../lexers lua lualibs gtdialog cdk deps: $(base_deps) termkey win32-deps: $(base_deps) win32gtk win32curses osx-deps: $(base_deps) gtkosx termkey @@ -387,7 +388,6 @@ win32gtk_zip = win32gtk-2.24.32.zip win32curses_zip = win32curses39.zip pdcurses_zip = PDCurses-3.9.zip gtkosx_tgz = gtkosx-2.24.31.tar.gz -bombay_zip = bombay.zip cloc = cloc-1.60.pl $(scintilla_zip): ; $(WGET) http://foicica.com/hg/scintilla/archive/$@ @@ -442,8 +442,6 @@ win32curses: pdcurses.patch | $(win32curses_zip) $(pdcurses_zip) cp $@/src/wincon/pdcurses.a $@/lib/ $(gtkosx_tgz): ; $(WGET) http://foicica.com/textadept/download/$@ gtkosx: | $(gtkosx_tgz) ; mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@ -$(bombay_zip): ; $(WGET) http://foicica.com/hg/bombay/archive/tip.zip -../doc/bombay: | $(bombay_zip) ; unzip -d $(dir $@) -j $| $(cloc): ; $(WGET) http://prdownloads.sourceforge.net/cloc/$@ sign-deps: | $(scintilla_tgz) $(lua_tgz) $(lpeg_tgz) $(lfs_zip) \ $(gtdialog_zip) $(cdk_tgz) $(termkey_tgz) $(win32gtk_zip) \ @@ -454,7 +452,7 @@ verify-deps: | $(wildcard $(basename $(wildcard *.asc))) clean-deps: rm -rf scintilla ../lexers lua gtdialog cdk termkey win32gtk win32curses \ - gtkosx $(notdir ../doc/bombay) + gtkosx # Count lines of code. |