oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix line endings

Browse Source
This commit is contained in:
itsmattkc
2019-06-15 07:39:55 -07:00
parent 13d6f9f5b2
commit 0acee942f4
300 changed files with 49260 additions and 49254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/windows/nsis/olive.nsi
+84 -84
View File
@@ -1,85 +1,85 @@
!include "MUI.nsh"
!define MUI_ICON "install icon.ico"
!define MUI_UNICON "uninstall icon.ico"
!define APP_NAME "Olive"
!define APP_TARGET "olive-editor"
!define MUI_FINISHPAGE_RUN "$INSTDIR\olive-editor.exe"
SetCompressor lzma
Name ${APP_NAME}
!ifdef X64
InstallDir "$PROGRAMFILES64\${APP_NAME}"
!else
InstallDir "$PROGRAMFILES32\${APP_NAME}"
!endif
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE LICENSE
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN_TEXT "Run ${APP_NAME}"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOlive"
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_LANGUAGE "English"
Section "Olive (required)"
SectionIn RO
SetOutPath $INSTDIR
File /r olive\*
WriteUninstaller "$INSTDIR\uninstall.exe"
SectionEnd
Section "Create Desktop shortcut"
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
SectionEnd
Section "Create Start Menu shortcut"
CreateDirectory "$SMPROGRAMS\${APP_NAME}"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
SectionEnd
Section "Associate *.ove files with Olive"
WriteRegStr HKCR ".ove" "" "OliveEditor.OVEFile"
WriteRegStr HKCR ".ove" "Content Type" "application/vnd.olive-project"
WriteRegStr HKCR "OliveEditor.OVEFile" "" "Olive project file"
WriteRegStr HKCR "OliveEditor.OVEFile\DefaultIcon" "" "$INSTDIR\olive-editor.exe,1"
WriteRegStr HKCR "OliveEditor.OVEFile\shell\open\command" "" "$\"$INSTDIR\olive-editor.exe$\" $\"%1$\""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
UninstPage uninstConfirm
UninstPage instfiles
Section "uninstall"
rmdir /r "$INSTDIR"
Delete "$DESKTOP\${APP_NAME}.lnk"
rmdir /r "$SMPROGRAMS\${APP_NAME}"
DeleteRegKey HKCR ".ove"
DeleteRegKey HKCR "OliveEditor.OVEFile"
DeleteRegKey HKCR "OliveEditor.OVEFile\DefaultIcon" ""
DeleteRegKey HKCR "OliveEditor.OVEFile\shell\open\command" ""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
Function LaunchOlive
ExecShell "" "$INSTDIR\${APP_TARGET}.exe"
!include "MUI.nsh"
!define MUI_ICON "install icon.ico"
!define MUI_UNICON "uninstall icon.ico"
!define APP_NAME "Olive"
!define APP_TARGET "olive-editor"
!define MUI_FINISHPAGE_RUN "$INSTDIR\olive-editor.exe"
SetCompressor lzma
Name ${APP_NAME}
!ifdef X64
InstallDir "$PROGRAMFILES64\${APP_NAME}"
!else
InstallDir "$PROGRAMFILES32\${APP_NAME}"
!endif
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE LICENSE
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN_TEXT "Run ${APP_NAME}"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOlive"
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_LANGUAGE "English"
Section "Olive (required)"
SectionIn RO
SetOutPath $INSTDIR
File /r olive\*
WriteUninstaller "$INSTDIR\uninstall.exe"
SectionEnd
Section "Create Desktop shortcut"
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
SectionEnd
Section "Create Start Menu shortcut"
CreateDirectory "$SMPROGRAMS\${APP_NAME}"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
SectionEnd
Section "Associate *.ove files with Olive"
WriteRegStr HKCR ".ove" "" "OliveEditor.OVEFile"
WriteRegStr HKCR ".ove" "Content Type" "application/vnd.olive-project"
WriteRegStr HKCR "OliveEditor.OVEFile" "" "Olive project file"
WriteRegStr HKCR "OliveEditor.OVEFile\DefaultIcon" "" "$INSTDIR\olive-editor.exe,1"
WriteRegStr HKCR "OliveEditor.OVEFile\shell\open\command" "" "$\"$INSTDIR\olive-editor.exe$\" $\"%1$\""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
UninstPage uninstConfirm
UninstPage instfiles
Section "uninstall"
rmdir /r "$INSTDIR"
Delete "$DESKTOP\${APP_NAME}.lnk"
rmdir /r "$SMPROGRAMS\${APP_NAME}"
DeleteRegKey HKCR ".ove"
DeleteRegKey HKCR "OliveEditor.OVEFile"
DeleteRegKey HKCR "OliveEditor.OVEFile\DefaultIcon" ""
DeleteRegKey HKCR "OliveEditor.OVEFile\shell\open\command" ""
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
SectionEnd
Function LaunchOlive
ExecShell "" "$INSTDIR\${APP_TARGET}.exe"
FunctionEnd
packaging/windows/resources.rc
+32 -32
View File
@@ -1,32 +1,32 @@
IDI_ICON1 ICON DISCARDABLE "olive.ico"
IDI_ICON2 ICON DISCARDABLE "olive_ove.ico"
#include <windows.h>
#include "version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", VER_COMPANYNAME_STR
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
VALUE "ProductName", VER_PRODUCTNAME_STR
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
IDI_ICON1 ICON DISCARDABLE "olive.ico"
IDI_ICON2 ICON DISCARDABLE "olive_ove.ico"
#include <windows.h>
#include "version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", VER_COMPANYNAME_STR
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
VALUE "ProductName", VER_PRODUCTNAME_STR
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
packaging/windows/version.h
+21 -21
View File
@@ -1,21 +1,21 @@
#ifndef VERSION_H
#define VERSION_H
#define VER_FILEVERSION 1,0,0,0
#define VER_FILEVERSION_STR "1.0.0.0\0"
#define VER_PRODUCTVERSION 1,0,0,0
#define VER_PRODUCTVERSION_STR "1.0\0"
#define VER_COMPANYNAME_STR "Olive Team"
#define VER_FILEDESCRIPTION_STR "Olive"
#define VER_INTERNALNAME_STR "Olive"
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2018 Olive Team"
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
#define VER_ORIGINALFILENAME_STR "Olive.exe"
#define VER_PRODUCTNAME_STR "Olive"
#define VER_COMPANYDOMAIN_STR "www.olivevideoeditor.org"
#endif // VERSION_H
#ifndef VERSION_H
#define VERSION_H
#define VER_FILEVERSION 1,0,0,0
#define VER_FILEVERSION_STR "1.0.0.0\0"
#define VER_PRODUCTVERSION 1,0,0,0
#define VER_PRODUCTVERSION_STR "1.0\0"
#define VER_COMPANYNAME_STR "Olive Team"
#define VER_FILEDESCRIPTION_STR "Olive"
#define VER_INTERNALNAME_STR "Olive"
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2018 Olive Team"
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
#define VER_ORIGINALFILENAME_STR "Olive.exe"
#define VER_PRODUCTNAME_STR "Olive"
#define VER_COMPANYDOMAIN_STR "www.olivevideoeditor.org"
#endif // VERSION_H