From 3c0f243e8986ca52d470b9884b86ff613379228f Mon Sep 17 00:00:00 2001 From: "p.kosyh" Date: Mon, 9 Nov 2009 08:43:41 +0000 Subject: [PATCH] Fixes to makefiles --- Makefile | 21 ++++++++++-- Rules.make | 1 - Rules.make.standalone | 2 +- Rules.make.system | 2 +- debian/docs | 2 -- setup.iss | 73 ++++++++++++++++++++++++++++++++++++++++ src/sdl-instead/Makefile | 2 +- 7 files changed, 95 insertions(+), 8 deletions(-) delete mode 120000 Rules.make delete mode 100644 debian/docs create mode 100644 setup.iss diff --git a/Makefile b/Makefile index 5390725..707f1f9 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,37 @@ include Rules.make +include config.make + +VERTITLE := instead-$(VERSION) +ARCHIVE := instead_$(VERSION).tar.gz SUBDIRS = src/sdl-instead stead games themes icon desktop doc languages -all: config.make +all: @for dir in $(SUBDIRS); do \ $(MAKE) -C $$dir $(@) || exit 1; \ done; +Rules.make: + ln -sf Rules.make.standalone Rules.make + config.make: echo "# you can define own flags here" > config.make -include config.make +svnclean: + svn st | grep "^?" | awk '{ print $$2 }' | grep -v "config.make" | while read l; do $(RM) -rf $$l; done + +tarball: clean + $(RM) -f Rules.make + ln -sf Rules.make.standalone Rules.make + ln -sf ./ $(VERTITLE) + tar -cz --exclude $(VERTITLE)/$(VERTITLE) --exclude .svn --exclude CVS --exclude $(ARCHIVE) -f $(ARCHIVE) $(VERTITLE)/* + $(RM) -f $(VERTITLE) clean: @for dir in $(SUBDIRS); do \ $(MAKE) clean -C $$dir $(@) || exit 1; \ done; + $(RM) -f $(ARCHIVE) install: all ifeq ($(SYSTEMSETUP), yes) @@ -35,3 +51,4 @@ ifeq ($(SYSTEMSETUP), yes) else echo No uninstall needed endif + diff --git a/Rules.make b/Rules.make deleted file mode 120000 index d0f4e26..0000000 --- a/Rules.make +++ /dev/null @@ -1 +0,0 @@ -Rules.make.standalone \ No newline at end of file diff --git a/Rules.make.standalone b/Rules.make.standalone index 2ac691f..f84dc4a 100644 --- a/Rules.make.standalone +++ b/Rules.make.standalone @@ -1,4 +1,4 @@ -VERSION := \"1.0.0\" +VERSION := 1.0.0 DESTDIR= BIN= diff --git a/Rules.make.system b/Rules.make.system index 5ff62d9..3a80038 100644 --- a/Rules.make.system +++ b/Rules.make.system @@ -1,4 +1,4 @@ -VERSION := \"1.0.0\" +VERSION := 1.0.0 PREFIX=/usr/local DESTDIR= diff --git a/debian/docs b/debian/docs deleted file mode 100644 index f3d4ef2..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -readme.txt -readme.txt diff --git a/setup.iss b/setup.iss new file mode 100644 index 0000000..4349130 --- /dev/null +++ b/setup.iss @@ -0,0 +1,73 @@ +[Setup] +AppName=INSTEAD +AppVerName=INSTEAD 1.0.0 +DefaultDirName={pf}\Pinebrush games\INSTEAD +DefaultGroupName=Pinebrush games +UninstallDisplayIcon={app}\sdl-instead.exe +OutputDir=. +OutputBaseFilename=instead-1.0.0 +AllowNoIcons=true + +[Languages] +Name: en; MessagesFile: compiler:Default.isl +Name: ru; MessagesFile: compiler:Languages\Russian.isl + +[Files] +Source: sdl-instead.exe; DestDir: {app} +Source: Microsoft.VC80.CRT\*; DestDir: {app}\Microsoft.VC80.CRT +Source: games\cat\*; DestDir: {app}\games\cat +Source: games\cat\gfx\*; DestDir: {app}\games\cat\gfx +Source: games\cat\mus\*; DestDir: {app}\games\cat\mus +Source: games\tutorial2\*; DestDir: {app}\games\tutorial2 +Source: games\tutorial2-en\*; DestDir: {app}\games\tutorial2-en +Source: icon\*; DestDir: {app}\icon +Source: doc\*; DestDir: {app}\doc +Source: stead\*; DestDir: {app}\stead +Source: languages\*; DestDir: {app}\languages +Source: themes\default\*; DestDir: {app}\themes\default +Source: themes\book\*; DestDir: {app}\themes\book +Source: themes\original\*; DestDir: {app}\themes\original +Source: themes\default-large\*; DestDir: {app}\themes\default-large +Source: *.dll; DestDir: {app} + +[CustomMessages] +CreateDesktopIcon=Create a &desktop icon +LaunchGame=Launch &game +UninstallMsg=Uninstall INSTEAD +RmSettingsMsg=Would you like to remove settings and saved games? +ru.CreateDesktopIcon=Создать &ярлык на рабочем столе +ru.LaunchGame=Запустить &игру +ru.UninstallMsg=Удалить INSTEAD +ru.RmSettingsMsg=Удалить настройки и сохранённые игры? +ru.UninstalledAll=Программа %1 была успешно удалена с Вашего компьютера. +; "полностью удалена" -> "успешно удалена" + +[Tasks] +Name: desktopicon; Description: {cm:CreateDesktopIcon} + +[Run] +Filename: {app}\sdl-instead.exe; Description: {cm:LaunchGame}; WorkingDir: {app}; Flags: postinstall + +[Icons] +Name: {commondesktop}\INSTEAD; Filename: {app}\sdl-instead.exe; WorkingDir: {app}; Tasks: desktopicon +Name: {group}\INSTEAD; Filename: {app}\sdl-instead.exe; WorkingDir: {app} +Name: {group}\{cm:UninstallMsg}; Filename: {uninstallexe} + +[UninstallDelete] +Name: {app}; Type: dirifempty +Name: {pf}\Pinebrush games; Type: dirifempty + +[Code] +procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); +begin + case CurUninstallStep of + usPostUninstall: + begin + if MsgBox(CustomMessage('RmSettingsMsg'), mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = idYes then + begin + // remove settings and saved games manually + DelTree(ExpandConstant('{localappdata}\instead'), True, True, True); + end; + end; + end; +end; diff --git a/src/sdl-instead/Makefile b/src/sdl-instead/Makefile index af3b085..e2844b3 100644 --- a/src/sdl-instead/Makefile +++ b/src/sdl-instead/Makefile @@ -1,7 +1,7 @@ include ../../Rules.make include ../../config.make -CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\" -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=$(VERSION) -DICON_PATH=\"${ICONPATH}/\" +CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\" -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH}/\" LDFLAGS += $(SDL_LFLAGS) $(LUA_LFLAGS)