Commit 2db4335c authored by André Simon's avatar André Simon

-Windows build adjustments

parent 0db62cbc
Pipeline #54320305 passed with stage
in 2 minutes and 28 seconds
......@@ -653,7 +653,7 @@ State CodeGenerator::validateState(State newState, State oldState)
params.push_back(Diluculum::LuaValue(token));
params.push_back(Diluculum::LuaValue(getCurrentKeywordClassId()) );
params.push_back(Diluculum::LuaValue(lineNumber) );
params.push_back(Diluculum::LuaValue(lineIndex-token.length()) );
params.push_back(Diluculum::LuaValue(lineIndex-(unsigned int)token.length()) );
Diluculum::LuaValueList res=
currentSyntax->getLuaState()->call ( *currentSyntax->getValidateStateChangeFct(),
......
......@@ -66,8 +66,12 @@ win32 {
CONFIG += static
LIBS += -LE:\Devel\git\highlight\src -lhighlight
LIBS += -LE:\Devel\cpp\lua_bin_5.3.0 -llua
#LIBS += -LD:\Devel\cpp\lua_bin_5.3.0_x64 -llua
contains(QT_ARCH, i386) {
LIBS += -LE:\Devel\cpp\lua_bin_5.3.0 -llua
} else {
LIBS += -LE:\Devel\cpp\lua_bin_5.3.0_x64 -llua
}
RC_FILE = highlight-gui.rc
QMAKE_POST_LINK = $$quote(E:\Devel\upx393w\upx.exe --best E:\Devel\git\highlight\highlight-gui.exe)
......
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
AppName=Highlight Code Converter
AppVerName=Highlight
OutputBaseFilename=highlight-setup-3.50-x64
AppPublisher=Andr Simon
AppPublisherURL=http://www.andre-simon.de
AppUpdatesURL=http://www.andre-simon.de
DefaultDirName={pf}\Highlight
DefaultGroupName=Highlight Code Converter
AllowNoIcons=yes
LicenseFile=..\..\COPYING
InfoAfterFile=..\..\README.adoc
Compression=lzma2/ultra
SolidCompression=yes
PrivilegesRequired=none
ArchitecturesInstallIn64BitMode=x64
[Tasks]
Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
[Files]
Source: "..\..\highlight-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "dlls\x64\*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "hl_icon_exe.ico"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\langDefs\*.lang"; DestDir: "{app}\langDefs\"; Flags: ignoreversion sortfilesbyextension
Source: "..\..\themes\*.theme"; DestDir: "{app}\themes\"; Flags: ignoreversion sortfilesbyextension
Source: "..\..\themes\base16\*.theme"; DestDir: "{app}\themes\base16\"; Flags: ignoreversion sortfilesbyextension
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: "..\..\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;
Source: "..\..\extras\*.py"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\*.pm"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\*.php"; DestDir: "{app}\extras\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\highlight_pipe.*"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\swig\*.*"; DestDir: "{app}\extras\swig"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\tcl\*.*"; DestDir: "{app}\extras\tcl"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\pandoc\*.*"; DestDir: "{app}\extras\pandoc"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\langDefs-resources\*.*"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\themes-resources\base16\*.*"; DestDir: "{app}\extras\themes-resources\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\themes-resources\css-themes\*.*"; DestDir: "{app}\extras\themes-resources\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\web_plugins\dokuwiki\*.*"; DestDir: "{app}\extras\plugins\dokuwiki\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\movabletype\*.*"; DestDir: "{app}\extras\plugins\movabletype\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\wordpress\*.*"; DestDir: "{app}\extras\plugins\wordpress"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\serendipity_event_highlight\*.*"; DestDir: "{app}\extras\plugins\serendipity_event_highlight"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\highlight.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: cli;
Source: "..\..\man\*.*"; DestDir: "{app}\man\"; Flags: ignoreversion; Components: cli;
Source: "..\include\*.*"; DestDir: "{app}\src\include\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\include\astyle\*.*"; DestDir: "{app}\src\include\astyle\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\include\Diluculum\*.*"; DestDir: "{app}\src\include\Diluculum\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\core\*.*"; Excludes: "*.o,*.depend"; DestDir: "{app}\src\core\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\core\astyle\*.*"; Excludes: "*.o"; DestDir: "{app}\src\core\astyle\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\core\Diluculum\*.*"; Excludes: "*.o"; DestDir: "{app}\src\core\Diluculum\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\gui-qt\*.*"; Excludes: "*.o,*.Release,*.Debug,ui_*,*.user,*.qm,Makefile"; DestDir: "{app}\src\gui-qt\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\cli\*.*"; Excludes: "*.o"; DestDir: "{app}\src\cli\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\w32-projects\*.iss"; DestDir: "{app}\projectfiles\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\w32-projects\highlight_cli\*.pro"; DestDir: "{app}\projectfiles\highlight_cli\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\w32-projects\highlight_lib\*.pro"; DestDir: "{app}\projectfiles\highlight_lib\"; Flags: ignoreversion; Components: sourcecode;
[Dirs]
Name: "{userappdata}\Highlight"; Attribs: hidden
[Components]
Name: "main"; Description: "Highlight GUI"; Types: full compact custom; Flags: fixed
Name: "cli"; Description: "Highlight command line interface"; Types: full
Name: "sourcecode"; Description: "Source code"; Types: full
Name: "portable"; Description: "Portable starter icon"; Types: full
[INI]
Filename: "{app}\Highlight.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.andre-simon.de"
[Icons]
Name: "{group}\Highlight"; Filename: "{app}\highlight-gui.exe"; IconFilename: "{app}\hl_icon_exe.ico";WorkingDir: "{app}"
Name: "{group}\Highlight Portable"; Filename: "{app}\highlight-gui.exe"; IconFilename: "{app}\hl_icon_exe.ico";WorkingDir: "{app}";Parameters: "--portable"; Components: portable;
Name: "{group}\Highlight on the Web"; Filename: "{app}\Highlight.url"
Name: "{group}\Uninstall Highlight"; Filename: "{uninstallexe}"
Name: "{userdesktop}\Highlight"; Filename: "{app}\highlight-gui.exe"; Tasks: desktopicon; IconFilename: "{app}\hl_icon_exe.ico";WorkingDir: "{app}"
Name: "{userdesktop}\Highlight Portable"; Filename: "{app}\highlight-gui.exe"; Tasks: desktopicon; IconFilename: "{app}\hl_icon_exe.ico";WorkingDir: "{app}";Parameters: "--portable"; Components: portable;
;Name: "{sendto}\Highlight"; Filename: "{app}\highlight-gui.exe"; IconFilename: "{app}\hl_icon_exe.ico";WorkingDir: "{app}"; Check: MyProgCheck
[Run]
Filename: "{app}\highlight-gui.exe"; Description: "Launch Highlight Code Converter"; Flags: nowait postinstall skipifsilent
[UninstallDelete]
Type: files; Name: "{app}\Highlight.url"
;[Code]
;function MyProgCheck(): Boolean;
;begin
; Result := MsgBox('Do you want to create an entry of Highlight in your SendTo folder?', mbConfirmation, MB_YESNO) = idYes;
;end;
......@@ -5,7 +5,7 @@
AppName=Highlight Code Converter
AppVerName=Highlight
OutputBaseFilename=highlight-setup-3.44
OutputBaseFilename=highlight-setup-3.50
AppPublisher=Andr Simon
AppPublisherURL=http://www.andre-simon.de
......@@ -14,7 +14,7 @@ DefaultDirName={pf}\Highlight
DefaultGroupName=Highlight Code Converter
AllowNoIcons=yes
LicenseFile=..\..\COPYING
InfoAfterFile=..\..\README
InfoAfterFile=..\..\README.adoc
Compression=lzma2/ultra
SolidCompression=yes
PrivilegesRequired=none
......@@ -30,30 +30,31 @@ Source: "..\..\langDefs\*.lang"; DestDir: "{app}\langDefs\"; Flags: ignoreversi
Source: "..\..\themes\*.theme"; DestDir: "{app}\themes\"; Flags: ignoreversion sortfilesbyextension
Source: "..\..\themes\base16\*.theme"; DestDir: "{app}\themes\base16\"; Flags: ignoreversion sortfilesbyextension
Source: "..\..\README*"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\TODO"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\AUTHORS"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\ChangeLog"; 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: "..\..\gui_files\l10n\*.qm"; DestDir: "{app}\gui_files\l10n\"; Flags: ignoreversion sortfilesbyextension
Source: "..\..\gui_files\ext\*.*"; DestDir: "{app}\gui_files\ext\"; Flags: ignoreversion
Source: "..\..\extras\*.py"; DestDir: "{app}\extras\"; Flags: ignoreversion;
Source: "..\..\extras\*.pm"; DestDir: "{app}\extras\"; Flags: ignoreversion;
Source: "..\..\extras\*.php"; DestDir: "{app}\extras\"; Flags: ignoreversion;
Source: "..\..\plugins\*.lua"; DestDir: "{app}\plugins\"; Flags: ignoreversion;
Source: "..\..\highlight.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: cli;
Source: "..\..\man\*.*"; DestDir: "{app}\man\"; Flags: ignoreversion; Components: cli;
Source: "..\..\extras\*.py"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\*.pm"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\*.php"; DestDir: "{app}\extras\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\highlight_pipe.*"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\swig\*.*"; DestDir: "{app}\extras\swig"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\tcl\*.*"; DestDir: "{app}\extras\tcl"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\pandoc\*.*"; DestDir: "{app}\extras\pandoc"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\css-themes\*.*"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\pandoc\*.*"; DestDir: "{app}\extras\pandoc"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\langDefs-resources\*.*"; DestDir: "{app}\extras\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\themes-resources\base16\*.*"; DestDir: "{app}\extras\themes-resources\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\themes-resources\css-themes\*.*"; DestDir: "{app}\extras\themes-resources\"; Flags: ignoreversion;Components: sourcecode;
Source: "..\..\extras\web_plugins\dokuwiki\*.*"; DestDir: "{app}\extras\plugins\dokuwiki\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\movabletype\*.*"; DestDir: "{app}\extras\plugins\movabletype\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\wordpress\*.*"; DestDir: "{app}\extras\plugins\wordpress"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\serendipity_event_highlight\*.*"; DestDir: "{app}\extras\plugins\serendipity_event_highlight"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\extras\web_plugins\serendipity_event_highlight\*.*"; DestDir: "{app}\extras\plugins\serendipity_event_highlight"; Flags: ignoreversion; Components: sourcecode;
Source: "..\..\highlight.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: cli;
Source: "..\..\man\*.*"; DestDir: "{app}\man\"; Flags: ignoreversion; Components: cli;
Source: "..\include\*.*"; DestDir: "{app}\src\include\"; Flags: ignoreversion; Components: sourcecode;
Source: "..\include\astyle\*.*"; DestDir: "{app}\src\include\astyle\"; Flags: ignoreversion; Components: sourcecode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment