Skip to content

Commit

Permalink
new, better build mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
marticliment committed Oct 1, 2022
1 parent 892e2ee commit 3070c8f
Show file tree
Hide file tree
Showing 131 changed files with 62 additions and 19 deletions.
5 changes: 3 additions & 2 deletions WingetUI.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "WingetUI"
#define MyAppVersion "1.3.1"
#define MyAppVersion "1.4.0"
#define MyAppPublisher "Martí Climent"
#define MyAppURL "https://github.com/martinet101/WingetUI"
#define MyAppExeName "WingetUI.exe"
Expand Down Expand Up @@ -56,7 +56,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "WingetUI"; ValueData: """{app}\WingetUI.exe"" --daemon"; Flags: uninsdeletevalue

[Files]
Source: "Y:\WinGetUI-Store\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: TaskKill('WingetUI.exe')
Source: "Y:\WinGetUI-Store\wingetuiBin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: TaskKill('WingetUI.exe')
Source: "Y:\WinGetUI-Store\wingetuiBin\*"; DestDir: "{app}"; Flags: createallsubdirs ignoreversion recursesubdirs; BeforeInstall: TaskKill('WingetUI.exe')
Source: "Y:\WinGetUI-Store\remove-old.cmd"; DestDir: "{app}"; Flags: deleteafterinstall
Source: "Y:\WinGetUI-Store\install_scoop.cmd"; DestDir: "{app}"; Flags: deleteafterinstall
Source: "Y:\WinGetUI-Store\vcredist.exe"; DestDir: "{app}"; Flags: deleteafterinstall
Expand Down
57 changes: 57 additions & 0 deletions build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
@echo on

python -m pip install -r requirements.txt

xcopy wingetui wingetui_bin /E /H /C /I /Y
cd wingetui_bin
python -m compileall -b .
del /S *.py
copy ..\wingetui\__init__.py .\
rmdir /Q /S __pycache__
rmdir /Q /S external\__pycache__
rmdir /Q /S lang\__pycache__
rmdir /Q /S build
rmdir /Q /S dist
python -m PyInstaller "Win.spec"
cd dist
cd ..
cd ..
rmdir /Q /S wingetuiBin
cd wingetui_bin
cd dist
move wingetuiBin ../../
cd ..
rmdir /Q /S build
rmdir /Q /S dist
cd ..
rmdir /Q /S wingetui_bin
cd wingetuiBin
rem cd tcl
rem rmdir /Q /S tzdata
rem cd ..
rem cd ..
del opengl32sw.dll
del Qt6Quick.dll
del Qt6Qml.dll
del Qt6OpenGL.dll
del Qt6QmlModels.dll
del Qt6Network.dll
del Qt6DataVisualization.dll
del Qt6VirtualKeyboard.dll
cd PySide6
del QtDataVisualization.pyd
del QtOpenGL.pyd
cd ..
cd ..

set INSTALLATOR="%SYSTEMDRIVE%\Program Files (x86)\Inno Setup 6\ISCC.exe"
if exist %INSTALLATOR% (
%INSTALLATOR% "WingetUI.iss"
"wingetui Installer.exe"
) else (
echo "Make installer is skipped, because installator missing."
echo "Running app..."
start /b wingetuiBin/wingetui.exe
)

pause
15 changes: 0 additions & 15 deletions build_win.bat

This file was deleted.

2 changes: 1 addition & 1 deletion install_scoop.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
powershell -NoProfile -Command "Set-ExecutionPolicy RemoteSigned -Scope CurrentUser"
powershell -NoProfile -Command "Invoke-WebRequest get.scoop.sh | Invoke-Expression"
powershell -NoProfile -Command 'iex "& {$(irm get.scoop.sh)} -RunAsAdmin"'
powershell -NoProfile -Command "scoop install git"
2 changes: 1 addition & 1 deletion wingetui/resources/install_scoop.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ echo This script is going to install scoop and it's required dependencies requir
pause
powershell -NoProfile -Command "Set-ExecutionPolicy RemoteSigned -Scope CurrentUser"
echo Installing scoop...
powershell -NoProfile -Command "Invoke-WebRequest get.scoop.sh | Invoke-Expression"
powershell -NoProfile -Command 'iex "& {$(irm get.scoop.sh)} -RunAsAdmin"'
echo Installing git...
powershell -NoProfile -Command "scoop install git"
echo Done!
Expand Down
Binary file removed wingetui/winget-cli/Assets/256x256.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed wingetui/winget-cli/Assets/CertOriginTrusted.png
Diff not rendered.
Binary file removed wingetui/winget-cli/Assets/CertOriginUntrusted.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed wingetui/winget-cli/Assets/Shield.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed wingetui/winget-cli/Assets/contrast-black/Shield.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed wingetui/winget-cli/Assets/contrast-white/Shield.png
Diff not rendered.

0 comments on commit 3070c8f

Please sign in to comment.