Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 04 Mar 2016 19:31:52 UTC Commit: f4b270a60e1d825de2dcc4db9951463fe32d5914 https://github.com/geany/geany/commit/f4b270a60e1d825de2dcc4db9951463fe32d59...
Log Message: ----------- Use the same DOCDIR on Windows than on other platforms
NSIS installer changes were not tested, hopefully they'll work.
Closes #928.
Modified Paths: -------------- geany.nsi.in src/utils.c wscript
Modified: geany.nsi.in 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -189,9 +189,9 @@ SectionEnd Section "Documentation" SEC04 SectionIn 1 SetOverwrite ifnewer - SetOutPath "$INSTDIR" - File /r "${RESOURCEDIR}\doc" - WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\doc\Manual.html" + SetOutPath "$INSTDIR\share\doc\geany\html" + File /r "${RESOURCEDIR}\doc*" + WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" "$INSTDIR\share\doc\geany\html\index.html" !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} CreateShortCut "$SMPROGRAMS$StartmenuFolder\Documentation.lnk" "$INSTDIR\Documentation.url" !insertmacro MUI_STARTMENU_WRITE_END @@ -302,7 +302,6 @@ Section Uninstall Delete "$DESKTOP\Geany.lnk"
RMDir /r "$INSTDIR\bin" - RMDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\etc" RMDir /r "$INSTDIR\include"
Modified: src/utils.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1912,7 +1912,7 @@ gchar *utils_get_help_url(const gchar *suffix)
#ifdef G_OS_WIN32 skip = 8; - uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL); + uri = g_strconcat("file:///", app->docdir, "/index.html", NULL); g_strdelimit(uri, "\", '/'); /* replace '\' by '/' */ #else skip = 7; @@ -2119,7 +2119,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type)
resdirs[RESOURCE_DIR_DATA] = g_build_filename(prefix, "data", NULL); resdirs[RESOURCE_DIR_ICON] = g_build_filename(prefix, "share", "icons", NULL); - resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "doc", NULL); + resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "share", "doc", "geany", "html", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL); resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL); g_free(prefix);
Modified: wscript 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -674,7 +674,7 @@ def build(bld): tagmanager/src/tm_workspace.h tagmanager/src/tm_parser.h ''') # Docs - base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}' + base_dir = '${DOCDIR}' ext = '.txt' if is_win32 else '' for filename in 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO'.split(): basename = _uc_first(filename, bld) @@ -686,11 +686,9 @@ def build(bld): # local_html_doc_filename supports installing HTML doc from in-tree geany.html if it exists local_html_doc_filename = os.path.join(bld.path.abspath(), 'doc', 'geany.html') if os.path.exists(html_doc_filename) or os.path.exists(local_html_doc_filename): - html_dir = '' if is_win32 else 'html/' - html_name = 'Manual.html' if is_win32 else 'index.html' start_dir = bld.path.find_dir('doc/images') - bld.install_files('${DOCDIR}/%simages' % html_dir, start_dir.ant_glob('*.png'), cwd=start_dir) - bld.install_as('${DOCDIR}/%s%s' % (html_dir, html_name), 'doc/geany.html') + bld.install_files('${DOCDIR}/html/images', start_dir.ant_glob('*.png'), cwd=start_dir) + bld.install_as('${DOCDIR}/html/index.html', 'doc/geany.html')
bld.install_as('${DOCDIR}/%s' % _uc_first('manual.txt', bld), 'doc/geany.txt') bld.install_as('${DOCDIR}/ScintillaLicense.txt', 'scintilla/License.txt')
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).