From: Jakub Skoczen Date: Tue, 24 Mar 2009 13:19:19 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.1.0~34^2^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=6267b857abe8e71547f34e00b6813e086dace360;hp=b4ee319ba0560f08e43e891ac5492563c7737fd7;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- diff --git a/Makefile.am b/Makefile.am index b65178b..9607db4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,8 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src test js doc -EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4 win/makefile +EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4 \ + win/makefile win/version.nsi win/version.nsi.in win/pazpar2.nsi win/license.txt dist-hook: if test -x /usr/bin/git -a -d .git; then git log >ChangeLog ; cp ChangeLog $(distdir); fi diff --git a/configure.ac b/configure.ac index 43d7370..0eb1621 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ AC_CONFIG_FILES([ doc/local.ent doc/common/Makefile doc/common/print.dsl - + win/version.nsi ]) AC_OUTPUT @@ -64,9 +64,6 @@ echo \ YAZ Include: ${YAZINC} YAZ La Lib: ${YAZLALIB} YAZ Lib: ${YAZLIB} - ICU Version: ${ICU_VERSION} - ICU Include: ${ICU_CPPFLAGS} - ICU Lib: ${ICU_LIBS} Bugreport: ${PACKAGE_BUGREPORT} ------------------------------------------------------------------------" diff --git a/etc/cf.xsl b/etc/cf.xsl index 45ccad8..53e8fc1 100644 --- a/etc/cf.xsl +++ b/etc/cf.xsl @@ -1,9 +1,6 @@ host, server_port, PACKAGE_NAME, PACKAGE_VERSION); + ser->host ? ser->host : "@", + server_port, PACKAGE_NAME, PACKAGE_VERSION); hp = http_header_append(c, hp, "Via" , server_via); hp = http_header_append(c, hp, "X-Forwarded-For", c->addr); } diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index b209f78..43d5bcf 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define CONFIG_NOEXTERNS #include "pazpar2_config.h" @@ -402,7 +403,16 @@ static char *parse_settings(xmlNode *node) char *r; if (src) - r = nmem_strdup(nmem, (const char *) src); + { + if (yaz_is_abspath((const char *) src)) + r = nmem_strdup(nmem, (const char *) src); + else + { + r = nmem_malloc(nmem, + strlen(confdir) + strlen((const char *) src) + 2); + sprintf(r, "%s/%s", confdir, src); + } + } else { yaz_log(YLOG_FATAL, "Must specify src in targetprofile"); @@ -512,7 +522,7 @@ static struct conf_server *parse_server(xmlNode *node) xsltStylesheet *conf_load_stylesheet(const char *fname) { char path[256]; - if (*fname == '/') + if (yaz_is_abspath(fname)) yaz_snprintf(path, sizeof(path), fname); else yaz_snprintf(path, sizeof(path), "%s/%s", confdir, fname); @@ -611,7 +621,13 @@ int read_config(const char *fname) yaz_log(YLOG_FATAL, "Failed to read %s", fname); exit(1); } - if ((p = strrchr(fname, '/'))) + if ((p = strrchr(fname, +#ifdef WIN32 + '\\' +#else + '/' +#endif + ))) { int len = p - fname; if (len >= sizeof(confdir)) diff --git a/win/.gitignore b/win/.gitignore new file mode 100644 index 0000000..982f1af --- /dev/null +++ b/win/.gitignore @@ -0,0 +1,6 @@ +version.nsi +dobj +obj +tmp +*.log +*~ diff --git a/win/license.txt b/win/license.txt new file mode 100644 index 0000000..b6e1c33 --- /dev/null +++ b/win/license.txt @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/win/makefile b/win/makefile index e2c5629..5bf4168 100644 --- a/win/makefile +++ b/win/makefile @@ -1,8 +1,8 @@ # This file is part of Pazpar2. -# Copyright (C) 2006-2008 Index Data +# Copyright (C) 2006-2009 Index Data DEBUG=0 # 0 for release, 1 for debug -USE_MANIFEST = 0 # Can be enabled Visual Studio 2005 +USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008 PACKAGE_NAME=pazpar2 PACKAGE_VERSION=1.1.0 @@ -23,10 +23,16 @@ default: all all: dirs yaz libxslt pazpar2 -NSIS="c:\program files\nsis\makensis-bz2.exe" +NSIS="c:\program files\nsis\makensis.exe" + +dist: + nmake DEBUG=1 clean + nmake DEBUG=0 clean + nmake DEBUG=0 + $(NSIS) pazpar2.nsi nsis: all - $(NSIS) yazpp.nsi + $(NSIS) pazpar2.nsi nsishelp: $(NSIS) @@ -39,11 +45,9 @@ WINDIR=$(ROOTDIR)\win # all these Win make things SRCDIR=$(ROOTDIR)\src # for the case we move them under src !if $(DEBUG) -OBJDIR=$(WINDIR)\dobj # debug objects -YAZD=yaz3d +OBJDIR=$(WINDIR)\dobj !else -OBJDIR=$(WINDIR)\obj # non-debug objects -YAZD=yaz3 +OBJDIR=$(WINDIR)\obj !endif TMPDIR=$(ROOTDIR)\win\tmp @@ -53,14 +57,24 @@ PAZPAR2_EXE=$(BINDIR)\pazpar2.exe pazpar2: $(PAZPAR2_EXE) -# YAZ includes & libs -YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" -YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include" -yaz: $(BINDIR)\$(YAZD).dll +YAZBINDIR=$(YAZ_DIR)\bin +!if $(DEBUG) +YAZ_LIB="$(YAZ_DIR)\lib\yaz3d.lib" +!if $(HAVE_ICU) +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3d.lib" +!endif +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll" +!else +YAZ_LIB="$(YAZ_DIR)\lib\yaz3.lib" +!if $(HAVE_ICU) +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3.lib" +!endif +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll" +!endif -$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" - copy "$(YAZ_DIR)\bin\icu*.dll" $(BINDIR) - copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) +YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include" # Copy libxslt and associates to our bin directory libxslt: $(BINDIR)\libxslt.dll @@ -83,12 +97,12 @@ LIBXSLT_LIB = \ "$(LIBXSLT_DIR)\lib\libxslt.lib" !if $(HAVE_ICU) -ICU_DEF=/DHAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_DIR)\include" +ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_DIR)\include" ICU_LIB= $(ICU_DIR)\lib\icudt.lib \ $(ICU_DIR)\lib\icuin.lib \ $(ICU_DIR)\lib\icuuc.lib !else -ICU_DEF=/DHAVE_ICU=0 +ICU_DEF=/DYAZ_HAVE_ICU=0 ICU_LIB= !endif @@ -169,7 +183,6 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\http.obj" \ "$(OBJDIR)\eventl.obj" \ "$(OBJDIR)\http_command.obj" \ - "$(OBJDIR)\icu_I18N.obj" \ "$(OBJDIR)\logic.obj" \ "$(OBJDIR)\record.obj" \ "$(OBJDIR)\reclists.obj" \ @@ -215,3 +228,9 @@ dirs: $(OBJDIR) $(WINDIR) $(BINDIR) $(TMPDIR) $(OBJDIR) $(WINDIR) $(BINDIR) $(TMPDIR): if not exist "$@/$(NUL)" mkdir "$@" +yaz: $(YAZ_DLL_TARGET) + +$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE) +# copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR) + copy "$(YAZBINDIR)\*.dll" $(BINDIR) + diff --git a/win/pazpar2.nsi b/win/pazpar2.nsi new file mode 100644 index 0000000..06be0be --- /dev/null +++ b/win/pazpar2.nsi @@ -0,0 +1,168 @@ +; This file is part of Pazpar2. +; Copyright (C) 2006-2009 Index Data + +!include version.nsi + +; Microsoft runtime CRT +; Uncomment exactly ONE section of the three below +; 1: MSVC 6 +!define VS_RUNTIME_DLL "" +!define VS_RUNTIME_MANIFEST "" + +; 2: VS 2003 +; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll" +;!define VS_RUNTIME_MANIFEST "" + +; 3: VS 2005 +;!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll" +;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" + + +!include "MUI.nsh" + +SetCompressor bzip2 + +Name "Pazpar2" +Caption "Index Data Pazpar2 ${VERSION} Setup" +OutFile "pazpar2_${VERSION}.exe" + +LicenseText "You must read the following license before installing:" +LicenseData license.txt + +ComponentText "This will install Pazpar2 on your computer:" +InstType "Full (w/ Source)" +InstType "Lite (w/o Source)" + +InstallDir "$PROGRAMFILES\Pazpar2" +InstallDirRegKey HKLM "SOFTWARE\Index Data\Pazpar2" "" + + +;---------------------------- +; Pages + + + !insertmacro MUI_PAGE_LICENSE "license.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES +; Page components +; Page directory +; Page instfiles + +; UninstPage uninstConfirm +; UninstPage instfiles + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" + +;-------------------------------- + +Section "" ; (default section) + SetOutPath "$INSTDIR" + ; add files / whatever that need to be installed here. + WriteRegStr HKLM "SOFTWARE\Index Data\Pazpar2" "" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pazpar2" "DisplayName" "Pazpar2 ${VERSION} (remove only)" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pazpar2" "UninstallString" '"$INSTDIR\uninst.exe"' + ; write out uninstaller + WriteUninstaller "$INSTDIR\uninst.exe" + SetOutPath $SMPROGRAMS\Pazpar2 + CreateShortCut "$SMPROGRAMS\Pazpar2\Pazpar2 Program Directory.lnk" \ + "$INSTDIR" + WriteINIStr "$SMPROGRAMS\Pazpar2\Pazpar2 Home page.url" \ + "InternetShortcut" "URL" "http://www.indexdata.dk/pazpar2/" + CreateShortCut "$SMPROGRAMS\Pazpar2\Uninstall Pazpar2.lnk" \ + "$INSTDIR\uninst.exe" + SetOutPath $INSTDIR + File LICENSE.txt + File ..\README + File ..\NEWS + SetOutPath $INSTDIR\etc + File /r ..\etc\*.xml + File /r ..\etc\*.xsl + File /oname=pazpar2.cfg ..\etc\pazpar2.cfg.dist + SetOutPath $INSTDIR\log + +SectionEnd ; end of default section + +Section "Pazpar2 Runtime" Pazpar2_Runtime + SectionIn 1 2 + IfFileExists "$INSTDIR\bin\pazpar2.exe" 0 Noservice + ExecWait '"$INSTDIR\bin\pazpar2.exe" -remove' +Noservice: + SetOutPath $INSTDIR\bin + ; File "${VS_RUNTIME_DLL}" + ; File "${VS_RUNTIME_MANIFEST}" + File ..\bin\*.dll + File ..\bin\*.exe + SetOutPath $SMPROGRAMS\Pazpar2 + SetOutPath $SMPROGRAMS\Pazpar2\Server + CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Server on console.lnk" \ + "$INSTDIR\bin\pazpar2.exe" '-f"$INSTDIR\etc\pazpar2.cfg"' + CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Install Pazpar2 service.lnk" \ + "$INSTDIR\bin\pazpar2.exe" '-install -l"$INSTDIR\log\pazpar2.log" -f"$INSTDIR\etc\pazpar2.cfg"' + CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Remove Pazpar2 service.lnk" \ + "$INSTDIR\bin\pazpar2.exe" '-remove' +SectionEnd + +Section "Pazpar2 Documentation" Pazpar2_Documentation + SectionIn 1 2 + SetOutPath $INSTDIR\doc + File /r ..\doc\*.css + File /r ..\doc\*.ent + File /r ..\doc\*.html + File /r ..\doc\*.xml + File /r ..\doc\*.png + File /r ..\doc\*.xsl + SetOutPath $SMPROGRAMS\Pazpar2 + CreateShortCut "$SMPROGRAMS\Pazpar2\HTML Documentation.lnk" \ + "$INSTDIR\doc\index.html" +SectionEnd + +Section "Pazpar2 Source" Pazpar2_Source + SectionIn 1 + SetOutPath $INSTDIR + File /r ..\*.c + File /r ..\*.h + SetOutPath $INSTDIR\win + File makefile + File *.nsi +SectionEnd + +; begin uninstall settings/section +UninstallText "This will uninstall Pazpar2 ${VERSION} from your system" + +Section Uninstall +; add delete commands to delete whatever files/registry keys/etc you installed here. + Delete "$INSTDIR\uninst.exe" + DeleteRegKey HKLM "SOFTWARE\Index Data\Pazpar2" + DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Pazpar2" + ExecWait '"$INSTDIR\bin\pazpar2" -remove' + RMDir /r $SMPROGRAMS\Pazpar2 + RMDir /r $INSTDIR + IfFileExists $INSTDIR 0 Removed + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Note: $INSTDIR could not be removed." +Removed: +SectionEnd + +;-------------------------------- +;Descriptions + + ;Language strings +LangString DESC_Pazpar2_Runtime ${LANG_ENGLISH} "Pazpar2 runtime files needed in order for it to run, such as DLLs." +LangString DESC_Pazpar2_Documentation ${LANG_ENGLISH} "Pazpar2 Users' guide and reference in HTML." +LangString DESC_Pazpar2_Source ${LANG_ENGLISH} "Source code of Pazpar2. Required if you need to rebuild Pazpar2 (for debugging purposes)." + +;Assign language strings to sections +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${Pazpar2_Runtime} $(DESC_Pazpar2_Runtime) +!insertmacro MUI_DESCRIPTION_TEXT ${Pazpar2_Documentation} $(DESC_Pazpar2_Documentation) +!insertmacro MUI_DESCRIPTION_TEXT ${Pazpar2_Source} $(DESC_Pazpar2_Source) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +; eof diff --git a/win/version.nsi.in b/win/version.nsi.in new file mode 100644 index 0000000..5fa481b --- /dev/null +++ b/win/version.nsi.in @@ -0,0 +1,2 @@ +!define VERSION "@PACKAGE_VERSION@" +