Commit d6203b81 authored by Denis Khachko's avatar Denis Khachko

Merge branch 'master' of git.lpm.org.ru:niisi/kumir2

parents bead494a 31d1f2c3
......@@ -28,63 +28,65 @@ FunctionEnd
Section "Kumir" Kumir
RMDir /r /REBOOTOK "$INSTDIR\lib\kumir2\plugins" ; Prevent conflicting modules from previous intallation
SetOutPath "$INSTDIR"
File LICENSE_RU.rtf
File vcredist_x86.exe
SetOutPath "$INSTDIR\bin"
File /r bin\*
SetOutPath "$INSTDIR\lib"
File /r lib\*
SetOutPath "$INSTDIR\share"
File /r share\*
SetOutPath "$INSTDIR\llvm-mingw"
File /nonfatal /r llvm-mingw\*
SetOutPath "$INSTDIR\python"
File /nonfatal /r python\*
ExecWait '"$INSTDIR\vcredist_x86.exe" /passive'
Delete /REBOOTOK "$INSTDIR\vcredist_x86.exe"
WriteRegStr HKCR ".kum" "" "ru.niisi.kumir2.program"
WriteRegStr HKCR "ru.niisi.kumir2.program" "" " "
WriteRegStr HKCR "ru.niisi.kumir2.program\shell\open\command" "" '"$INSTDIR\bin\kumir2-open.exe" "%1"'
WriteRegStr HKCR "ru.niisi.kumir2.program\shell\ \command" "" 'wscript.exe "$INSTDIR\bin\kumir2-llvmc-w.vbs" "%L"'
WriteRegStr HKCR "ru.niisi.kumir2.program\DefaultIcon" "" "$INSTDIR\share\icons\kumir2-kum.ico"
WriteRegStr HKCR ".kod" "" "ru.niisi.kumir2.bytecode"
WriteRegStr HKCR "ru.niisi.kumir2.bytecode" "" " "
WriteRegStr HKCR "ru.niisi.kumir2.bytecode\shell\open\command" "" '"$INSTDIR\bin\kumir2-run.exe" "%1" "%*"'
WriteRegStr HKCR "ru.niisi.kumir2.bytecode\DefaultIcon" "" "$INSTDIR\share\icons\kumir2-kod.ico"
Call RefreshShellIcons
CreateDirectory "$SMPROGRAMS\2"
CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-classic.exe"
CreateShortCut "$SMPROGRAMS\2\ .lnk" "$INSTDIR\bin\kumir2-highgrade.exe"
CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-ide.exe"
CreateShortCut "$SMPROGRAMS\2\ .lnk" "$INSTDIR\bin\kumir2-teacher.exe"
; Uninstaller registration
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "DisplayName" "2"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "UninstallString" "$INSTDIR\uninstall.exe"
WriteUninstaller $INSTDIR\uninstall.exe
RMDir /r /REBOOTOK "$INSTDIR\lib\kumir2\plugins" ; Prevent conflicting modules from previous intallation
SetOutPath "$INSTDIR"
File LICENSE_RU.rtf
File vcredist_x86.exe
SetOutPath "$INSTDIR\bin"
File /r bin\*
SetOutPath "$INSTDIR\lib"
File /r lib\*
SetOutPath "$INSTDIR\share"
File /r share\*
SetOutPath "$INSTDIR\share"
File /r src\*
SetOutPath "$INSTDIR\llvm-mingw"
File /nonfatal /r llvm-mingw\*
SetOutPath "$INSTDIR\python"
File /nonfatal /r python\*
ExecWait '"$INSTDIR\vcredist_x86.exe" /passive'
Delete /REBOOTOK "$INSTDIR\vcredist_x86.exe"
WriteRegStr HKCR ".kum" "" "ru.niisi.kumir2.program"
WriteRegStr HKCR "ru.niisi.kumir2.program" "" " "
WriteRegStr HKCR "ru.niisi.kumir2.program\shell\open\command" "" '"$INSTDIR\bin\kumir2-open.exe" "%1"'
WriteRegStr HKCR "ru.niisi.kumir2.program\shell\ \command" "" 'wscript.exe "$INSTDIR\bin\kumir2-llvmc-w.vbs" "%L"'
WriteRegStr HKCR "ru.niisi.kumir2.program\DefaultIcon" "" "$INSTDIR\share\icons\kumir2-kum.ico"
WriteRegStr HKCR ".kod" "" "ru.niisi.kumir2.bytecode"
WriteRegStr HKCR "ru.niisi.kumir2.bytecode" "" " "
WriteRegStr HKCR "ru.niisi.kumir2.bytecode\shell\open\command" "" '"$INSTDIR\bin\kumir2-run.exe" "%1" "%*"'
WriteRegStr HKCR "ru.niisi.kumir2.bytecode\DefaultIcon" "" "$INSTDIR\share\icons\kumir2-kod.ico"
Call RefreshShellIcons
CreateDirectory "$SMPROGRAMS\2"
CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-classic.exe"
CreateShortCut "$SMPROGRAMS\2\ .lnk" "$INSTDIR\bin\kumir2-highgrade.exe"
CreateShortCut "$SMPROGRAMS\2\-.lnk" "$INSTDIR\bin\kumir2-ide.exe"
CreateShortCut "$SMPROGRAMS\2\ .lnk" "$INSTDIR\bin\kumir2-teacher.exe"
; Uninstaller registration
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "DisplayName" "2"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2" "UninstallString" "$INSTDIR\uninstall.exe"
WriteUninstaller $INSTDIR\uninstall.exe
SectionEnd
Section "Uninstall"
Delete /REBOOTOK "$INSTDIR\uninstall.exe"
RMDir /r /REBOOTOK "$INSTDIR"
RMDir /r /REBOOTOK "$SMPROGRAMS\2"
DeleteRegKey HKCR ".kum"
DeleteRegKey HKCR "ru.niisi.kumir2.program"
DeleteRegKey HKCR ".kod"
DeleteRegKey HKCR "ru.niisi.kumir2.bytecode"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2"
Delete /REBOOTOK "$INSTDIR\uninstall.exe"
RMDir /r /REBOOTOK "$INSTDIR"
RMDir /r /REBOOTOK "$SMPROGRAMS\2"
DeleteRegKey HKCR ".kum"
DeleteRegKey HKCR "ru.niisi.kumir2.program"
DeleteRegKey HKCR ".kod"
DeleteRegKey HKCR "ru.niisi.kumir2.bytecode"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\kumir2"
SectionEnd
......@@ -134,6 +134,8 @@ TextLine::Margin & TextDocument::marginAt(uint index)
}
else {
static TextLine::Margin dummy;
dummy.text.clear();
dummy.errors.clear();
return dummy;
}
}
......
......@@ -1880,7 +1880,8 @@ llvm::Value * LLVMGenerator::createConstant(llvm::IRBuilder<> & builder, const A
arg = builder.CreateGlobalStringPtr(strval);
func = kumirCreateString_;
}
llvm::Value * tmp = CreateAlloca(builder, ty, CString(), allocaPlace);
// llvm::Value * tmp = CreateAlloca(builder, ty, CString(), allocaPlace);
llvm::Value * tmp = CreateAlloca(builder, ty, CString(), FunctionBegin);
// llvm::Value * tmp = builder.CreateAlloca(ty);
result = builder.CreateCall2(func, tmp, arg);
Q_ASSERT(result);
......
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