diff --git a/.gitignore b/.gitignore index 01c9be5d..b34c94d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +# TweetDuck installer builds +bld/* +!bld/*.iss +!bld/*.bat +!bld/Resources + # User-specific files *.suo *.user @@ -19,16 +25,9 @@ x64/ x86/ [Bb]in/ [Oo]bj/ -bld/* -!bld/gen_full.iss -!bld/gen_port.iss -!bld/gen_upd.iss -!bld/Resources # Visual Studio 2015 cache/options directory .vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ # MSTest test Results [Tt]est[Rr]esult*/ @@ -38,11 +37,6 @@ bld/* *.VisualState.xml TestResult.xml -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - # DNX project.lock.json artifacts/ @@ -71,27 +65,12 @@ artifacts/ *.svclog *.scc -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - # Visual Studio profiler *.psess *.vsp *.vspx *.sap -# TFS 2012 Local Workspace -$tf/ - # Guidance Automation Toolkit *.gpState @@ -118,33 +97,9 @@ nCrunchTemp_* *.mm.* AutoTest.Net/ -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - # Click-Once directory publish/ -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - # NuGet Packages *.nupkg # The packages folder can be ignored because of Package Restore @@ -157,17 +112,6 @@ publish/ *.nuget.props *.nuget.targets -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - # Windows Store app package directory AppPackages/ BundleArtifacts/ @@ -189,9 +133,6 @@ ClientBin/ node_modules/ orleans.codegen.cs -# RIA/Silverlight projects -Generated_Code/ - # Backup & report files from converting an old project file # to a newer Visual Studio version. Backup files are not needed, # because we have git ;-) @@ -200,40 +141,3 @@ Backup*/ UpgradeLog*.XML UpgradeLog*.htm -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/README.md b/README.md index 7a500564..093401cb 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,6 @@ PM> Install-Package CefSharp.WinForms -Version 55.0.0 PM> Install-Package Microsoft.VC120.CRT.JetBrains ``` -After building, run either `_postbuild.bat` if you want to package the files yourself, or `bld/RUN BUILD.bat` to generate installer files using Inno Setup. Do not run both files consecutively, otherwise the program will crash - if you want to do both, rebuild the project before running each file. +After building, run either `_postbuild.bat` if you want to package the files yourself, or `bld/RUN BUILD.bat` to generate installer files using Inno Setup (make sure the Inno Setup binaries are on your PATH). Do not run both files consecutively, otherwise the program will crash - if you want to do both, rebuild the project before running each file. -Built files are then available in **bin/x86** and/or **bin/x64**, installer files are generated in **bld/Output**. If you decide to release a custom version publicly, please make it clear that it is not the original TweetDuck. +Built files are then available in **bin/x86**, installer files are generated in **bld/Output**. If you decide to release a custom version publicly, please make it clear that it is not the original TweetDuck. diff --git a/bld/RUN BUILD.bat b/bld/RUN BUILD.bat new file mode 100644 index 00000000..5665ad60 --- /dev/null +++ b/bld/RUN BUILD.bat @@ -0,0 +1,8 @@ +if exist "..\bin\x86\Release\CefSharp.BrowserSubprocess.exe" ( + del "..\bin\x86\Release\TweetDuck.Browser.exe" + ren "..\bin\x86\Release\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe" +) + +start "" /B "ISCC.exe" /Q "gen_full.iss" +start "" /B "ISCC.exe" /Q "gen_port.iss" +start "" /B "ISCC.exe" /Q "gen_upd.iss"