210618.1 · 80f0d25082e6d677a4b11417404fbea2395ec190
#186 fix Windows file pattern expansion with -B
reading declarations
@@ -158,6 +158,14 @@ bool getDirectoryEntries ( vector<string> &fileList, bool recursiveSearch ) { if ( !wildcard.empty() ) {++#ifdef _WIN32+ // avoid cmd shell file pattern expansion+ if ( wildcard.size()>2 && wildcard[0]=='\'' && wildcard[wildcard.size()-1]=='\'' ) {+ wildcard = wildcard.substr (1, wildcard.size()-2);+ }+#endif+ string directory_path; string::size_type Pos = wildcard.find_last_of ( pathSeparator ); if ( Pos == string::npos ) {
src/w32-projects/highlight-setup-x86.iss
@@ -5,7 +5,7 @@ AppName=Highlight Code Converter AppVerName=Highlight-OutputBaseFilename=highlight-setup-4.0-x64+OutputBaseFilename=highlight-setup-4.1-x64 AppPublisher=André Simon AppPublisherURL=http://www.andre-simon.de@@ -36,7 +36,7 @@ Source: "..\..\README*"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\AUTHORS"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\ChangeLog.adoc"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\COPYING"; DestDir: "{app}"; Flags: ignoreversion-Source: "..\..\filetypes.conf"; DestDir: "{app}"; Flags: ignoreversion+Source: "..\..\*.conf"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\gui_files\l10n\*.qm"; DestDir: "{app}\gui_files\l10n\"; Flags: ignoreversion sortfilesbyextension Source: "..\..\gui_files\ext\*.*"; DestDir: "{app}\gui_files\ext\"; Flags: ignoreversion
src/w32-projects/highlight-setup.iss
@@ -5,7 +5,7 @@ AppName=Highlight Code Converter AppVerName=Highlight-OutputBaseFilename=highlight-setup-4.0+OutputBaseFilename=highlight-setup-4.1 AppPublisher=André Simon AppPublisherURL=http://www.andre-simon.de@@ -35,7 +35,7 @@ Source: "..\..\README*"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\AUTHORS"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\ChangeLog.adoc"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\COPYING"; DestDir: "{app}"; Flags: ignoreversion-Source: "..\..\filetypes.conf"; DestDir: "{app}"; Flags: ignoreversion+Source: "..\..\*.conf"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\gui_files\l10n\*.qm"; DestDir: "{app}\gui_files\l10n\"; Flags: ignoreversion sortfilesbyextension Source: "..\..\gui_files\ext\*.*"; DestDir: "{app}\gui_files\ext\"; Flags: ignoreversion Source: "..\..\plugins\*.lua"; DestDir: "{app}\plugins\"; Flags: ignoreversion;
src/w32-projects/highlight_cli/highlight_cli.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app win32 {- DESTDIR = ..\\..+ DESTDIR = ..\\..\\.. SOURCES += ..\\..\\cli\\main.cpp \ ..\\..\\cli\\help.cpp \ ..\\..\\cli\\cmdlineoptions.cpp \@@ -55,4 +55,4 @@ contains( LINKTYPE, LUA52 ) { unix:DEFINES += USE_LUA52 } -win32:QMAKE_POST_LINK = F:\upx393w\upx.exe --best --force ..\..\highlight.exe+win32:QMAKE_POST_LINK = F:\upx393w\upx.exe --best --force ..\..\..\highlight.exe