Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parempaa koodii #18

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
*.user
*.sln.docstates

# NSIS
nsis/LICENSE
nsis/*.exe

# Build results
build/

[Dd]ebug/
[Rr]elease/
Expand Down Expand Up @@ -133,7 +138,7 @@ $RECYCLE.BIN/
_NCrunch*

jammer-Setup_V1.X.X.exe
nsis-folder/jammer.exe
nsis-folder/raylib.dll
nsis/jammer.exe
nsis/raylib.dll
.vscode/launch.json
.vscode/tasks.json
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2024 Jooapa

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
26 changes: 11 additions & 15 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
dotnet publish -r win10-x64 -c Release /p:PublishSingleFile=true --self-contained
@ECHO off
@REM dotnet publish -r win10-x64 -c Release /p:PublishSingleFile=true --self-contained

@echo off
set "sourceFolder=bin\Release\net7.0\win10-x64\publish"
set "targetFolder=nsis-folder"
SET "sourceFolder=bin\Release\net7.0\win10-x64\publish"
SET "targetFolder=nsis"

rem Copy jammer.exe
copy /y "%sourceFolder%\jammer.exe" "%targetFolder%\jammer.exe"
@REM COPY jammer.exe
@REM COPY /B /Y "%sourceFolder%\jammer.exe" "%targetFolder%\jammer.exe"
@REM COPY /Y LICENSE %targetFolder%

echo Files copied successfully.
makensis %targetFolder%\setup.nsi

makensis setup.nsi
IF not EXIST ".\build\" MKDIR .\build\
COPY /B /Y "%targetFolder%\jammer-Setup_V1.X.X.exe" ".\build\"

rem if program files (x86)/jammer exists, run C:\Program Files (x86)\jammer\Uninstall.exe
if exist "C:\Program Files (x86)\jammer" (
echo Uninstalling previous version...
start "" "C:\Program Files (x86)\jammer\Uninstall.exe"
)

jammer-Setup_V1.X.X.exe
.\build\jammer-Setup_V1.X.X.exe
1 change: 1 addition & 0 deletions jammer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<RootNamespace>jammer</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ApplicationIcon>jammer_HQ.ico</ApplicationIcon>
</PropertyGroup>

<ItemGroup>
Expand Down
25 changes: 25 additions & 0 deletions jammer.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jammer", "jammer.csproj", "{12AE68F3-49AD-4352-88DF-3461BF93972F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{12AE68F3-49AD-4352-88DF-3461BF93972F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12AE68F3-49AD-4352-88DF-3461BF93972F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12AE68F3-49AD-4352-88DF-3461BF93972F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12AE68F3-49AD-4352-88DF-3461BF93972F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4238CBB0-85B8-45F0-9F6B-969E2DE3B234}
EndGlobalSection
EndGlobal
Binary file added jammer_HQ.ico
Binary file not shown.
1 change: 0 additions & 1 deletion nsis-folder/run_command.bat

This file was deleted.

20 changes: 0 additions & 20 deletions nsis-folder/setup.ps1

This file was deleted.

20 changes: 0 additions & 20 deletions nsis-folder/uninstall.ps1

This file was deleted.

File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions nsis/open_with_jammer.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jammer %1
2 changes: 2 additions & 0 deletions nsis/run_command.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ECHO %1
pause
Loading