[Groonga-commit] groonga/groonga [master] [windows] move setup.nsi to packages/windows/.

Back to archive index

null+****@clear***** null+****@clear*****
2011年 8月 5日 (金) 23:26:51 JST


Kouhei Sutou	2011-08-05 14:26:51 +0000 (Fri, 05 Aug 2011)

  New Revision: f5a6319333879bf4b7169ab496b48919a21d1e99

  Log:
    [windows] move setup.nsi to packages/windows/.

  Modified files:
    Makefile.am
    configure.ac
    packages/windows/Makefile.am
  Renamed files:
    packages/windows/setup.nsi.in
      (from setup.nsi)

  Modified: Makefile.am (+0 -12)
===================================================================
--- Makefile.am    2011-08-05 14:11:22 +0000 (1736f97)
+++ Makefile.am    2011-08-05 14:26:51 +0000 (22b16e5)
@@ -35,18 +35,6 @@ dist-hook:
 benchmark:
 	cd test/benchmark && $(MAKE) $(AM_MAKEFLAGS) benchmark
 
-win32-installer: all
-	rm -rf dist
-	$(MKDIR_P) dist/bin/ dist/include/ dist/lib/ dist/doc/
-	cp -p $(builddir)/src/.libs/*.exe dist/bin/
-	cp -p $(builddir)/lib/.libs/*.dll dist/bin/
-	cp -p $(builddir)/lib/.libs/*.dll.a dist/lib/
-	cp -p $(builddir)/lib/.libs/libgroonga.dll.a dist/lib/groonga.lib
-	cp -p $(builddir)/include/groonga.h dist/include/
-	cp -rp $(builddir)/include/groonga/ dist/include/
-	nkf -Wsc $(builddir)/doc/ja/README > dist/doc/README.txt
-	makensis setup.nsi
-
 tag:
 	cd $(top_srcdir) && git tag v$(VERSION) -a -m 'groonga $(VERSION)!!!'
 

  Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac    2011-08-05 14:11:22 +0000 (a3d6844)
+++ configure.ac    2011-08-05 14:26:51 +0000 (c23ecc2)
@@ -134,6 +134,7 @@ AC_CONFIG_FILES([
   packages/source/Makefile
   packages/windows/Makefile
   packages/windows/patches/Makefile
+  packages/windows/setup.nsi
   data/Makefile
   data/html/Makefile
   data/munin/Makefile

  Modified: packages/windows/Makefile.am (+4 -1)
===================================================================
--- packages/windows/Makefile.am    2011-08-05 14:11:22 +0000 (eee1809)
+++ packages/windows/Makefile.am    2011-08-05 14:26:51 +0000 (28e420a)
@@ -3,7 +3,7 @@ EXTRA_DIST = Rakefile
 
 all:
 
-release: build source upload
+release: build package installer upload
 
 ensure-rsync-path:
 	@if test -z "$(RSYNC_PATH)"; then				\
@@ -28,6 +28,9 @@ build: source
 build-groonga: source
 	$(RUBY) -S rake build:groonga $(build_options)
 
+installer:
+	makensis setup.nsi
+
 package:
 	mkdir -p files
 	rm -rf files/$(PACKAGE)-$(VERSION)

  Renamed: packages/windows/setup.nsi.in (+12 -21) 77%
===================================================================
--- setup.nsi    2011-08-05 14:11:22 +0000 (6b04b27)
+++ packages/windows/setup.nsi.in    2011-08-05 14:26:51 +0000 (3592d61)
@@ -1,7 +1,7 @@
-; Copyright (c) 2010 Kouhei Sutou <kou****@clear*****>
+; Copyright (c) 2010-2011 Kouhei Sutou <kou****@clear*****>
 
-!define PRODUCT_NAME "groonga"
-!define PRODUCT_VERSION "0.1.9"
+!define PRODUCT_NAME "@PACKAGE@"
+!define PRODUCT_VERSION "@VERSION@"
 !define PRODUCT_PUBLISHER "Brazil"
 !define PRODUCT_WEB_SITE "http://groonga.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -25,13 +25,13 @@ SetCompressor lzma
 !insertmacro MUI_PAGE_DIRECTORY
 var ICONS_GROUP
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "groonga"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${PRODUCT_NAME}"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
 !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
 !insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\README.txt"
+; !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\README.txt"
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_INSTFILES
@@ -39,8 +39,8 @@ var ICONS_GROUP
 !insertmacro MUI_LANGUAGE "Japanese"
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "groonga-${PRODUCT_VERSION}-i386-mswin32.exe"
-InstallDir "$PROGRAMFILES\groonga"
+OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}-x64.exe"
+InstallDir "${PROGRAMFILES}\${PRODUCT_NAME}"
 ShowInstDetails show
 ShowUnInstDetails show
 
@@ -51,31 +51,22 @@ Section "groonga"
   SectionIn 1 RO
   SetOverwrite ifdiff
 
-  SetOutPath $INSTDIR\bin
-  File /r dist\bin\*
-
-  SetOutPath $INSTDIR\include
-  File /r dist\include\*
-
-  SetOutPath $INSTDIR\lib
-  File /r dist\lib\*
-
-  SetOutPath $INSTDIR\doc
-  File /r dist\doc\*
+  SetOutPath $INSTDIR
+  File /r dist\*
 SectionEnd
 
 Section -AdditionalIcons
   SetOutPath $INSTDIR
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
   CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" $INSTDIR\uninstall_groonga.exe
+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" $INSTDIR\uninstall_${PACKAGE_NAME}.exe
   !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
 Section -Post
-  WriteUninstaller $INSTDIR\uninstall_groonga.exe
+  WriteUninstaller $INSTDIR\uninstall_${PACKAGE_NAME}.exe
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" $INSTDIR\uninstall_groonga.exe
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" $INSTDIR\uninstall_${PACAKGE_NAME}.exe
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"




Groonga-commit メーリングリストの案内
Back to archive index