From 83cc26c4471bbf5be58589e2f43a4caba6b98469 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Thu, 26 Dec 2019 10:49:01 -0700 Subject: [PATCH] Adding source code to windows install --- inno/ucblogo.iss | 8 +++++--- makefile.msys | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/inno/ucblogo.iss b/inno/ucblogo.iss index 0e896dc3..bb68e950 100644 --- a/inno/ucblogo.iss +++ b/inno/ucblogo.iss @@ -17,7 +17,7 @@ DisableStartupPrompt=yes DisableProgramGroupPage=yes AllowNoIcons=yes WindowStartMaximized=no -LicenseFile=C:\UCBLOGO\lib\logo\LICENSE +LicenseFile=..\LICENSE PrivilegesRequiredOverridesAllowed=dialog commandline [Components] @@ -25,6 +25,7 @@ Name: "program"; Description: "Program Files"; Types: full compact custom; Flags Name: "help"; Description: "Help Files"; Types: full compact custom Name: "csls"; Description: "Programs from Computer Science Logo Style"; Types: full compact custom Name: "pdf"; Description: "User Manual in PDF format"; Types: full custom +Name: "source"; Description: "Source Files"; Types: full custom [Tasks] Name: "programmenu"; Description: "Create a Program menu entry"; GroupDescription: "Shortcuts:" @@ -40,7 +41,8 @@ Source: "C:\UCBLOGO\lib\logo\HELPFILES\*.*"; DestDir: "{app}\HELPFILE"; CopyMode Source: "C:\UCBLOGO\lib\logo\LOGOLIB\*.*"; DestDir: "{app}\LOGOLIB"; CopyMode: alwaysoverwrite; Components: program Source: "C:\UCBLOGO\lib\logo\LICENSE"; DestDir: "{app}"; CopyMode: alwaysoverwrite; Components: program Source: "C:\UCBLOGO\lib\logo\README.txt"; DestDir: "{app}"; CopyMode: alwaysoverwrite; Components: program -Source: "C:\UCBLOGO\DOCS\usermanual.pdf"; DestDir: "{app}\DOCS"; CopyMode: alwaysoverwrite; Components: pdf +Source: "C:\UCBLOGO\lib\logo\usermanual.pdf"; DestDir: "{app}\DOCS"; CopyMode: alwaysoverwrite; Components: pdf +Source: "C:\UCBLOGO\lib\logo\SOURCE\*.*"; DestDir: "{app}\SOURCE"; CopyMode: alwaysoverwrite; Components: source [Icons] Name: "{group}\Berkeley Logo"; Filename: "{app}\ucblogo.exe"; WorkingDir: "{app}"; Tasks: programmenu @@ -54,7 +56,7 @@ Root: HKA; Subkey: "Software\UCB\UCBLogo"; ValueType: string; ValueName: "HELPFI Root: HKA; Subkey: "Software\UCB\UCBLogo"; ValueType: string; ValueName: "CSLS"; ValueData: "{app}\CSLS" [Messages] -WelcomeLabel2=This will install [name/ver] on your computer.%n%nThis installer was created with the freeware Inno Setup Compiler by Jordan Russell with portions by Martijn Laan.%nhttp://www.wintax.nl/isx/ +WelcomeLabel2=This will install [name/ver] on your computer.%n%nThis installer was created with the freeware Inno Setup Compiler by Jordan Russell with portions by Martijn Laan.%nhttp://www.jrsoftware.org/isinfo.php LicenseLabel=UCBLogo is free, and has NO WARRANTY. (See sections 15 and 16 below.)%nThe other license provisions are only about distributing Logo to other people. ComponentsDiskSpaceMBLabel=Current selection requires at least [kb] KB of disk space. diff --git a/makefile.msys b/makefile.msys index 1d462056..467e449e 100644 --- a/makefile.msys +++ b/makefile.msys @@ -73,8 +73,8 @@ ship: rm -f makefile makehelp logo *.o libloc.c cd docs; $(MAKE) ship -install: all - for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done +install_win: all + for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls $(LIBLOC)/source; do [ -d $$d ] || mkdir -p $$d || exit 1; done cp logo.exe $(BINDIR)/ucblogo.exe cp /mingw/bin/libgcc_s_dw2-1.dll /mingw/bin/libstdc++-6.dll $(BINDIR)/ cp -f logolib/* $(LIBLOC)/logolib/. @@ -82,6 +82,8 @@ install: all cp -f csls/* $(LIBLOC)/csls/. cp -f LICENSE $(LIBLOC)/ cp -f README.md $(LIBLOC)/README.txt + cp -f *.[ch]* makefile.msys ucblogo.xpm logo_win.rc logologo.ico makelib Messages docs/usermanual.texi $(LIBLOC)/source/ + cp -f docs/usermanual.pdf $(LIBLOC)/ #(cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install) # prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install