Merge branch 'master' of yap.dcc.fc.up.pt:yap-6

This commit is contained in:
Vitor Santos Costa 2010-02-23 01:07:03 +00:00
commit 39785a72ce
4 changed files with 22 additions and 20 deletions

3
COPYING Executable file
View File

@ -0,0 +1,3 @@
This system is distributed under the LGPL licence terms. For details
visit http://www.gnu.org/copyleft/lesser.html.

10
Makefile.in Normal file → Executable file
View File

@ -29,7 +29,7 @@ INFODIR=$(SHAREDIR)/info
# #
# where to store documentaion files # where to store documentaion files
# #
DOCSDIR=$(SHAREDIR)/docs/yap DOCSDIR=$(SHAREDIR)/docs/Yap
# #
# Add this flag to YAP_EXTRAS if you need the extension: # Add this flag to YAP_EXTRAS if you need the extension:
@ -511,6 +511,10 @@ install_unix: startup.yss libYap.a
@INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR) @INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
mkdir -p $(DESTDIR)$(DOCSDIR)
$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)
$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)
for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
@INSTALL_DLLS@ (cd packages/PLStream; $(MAKE) install) @INSTALL_DLLS@ (cd packages/PLStream; $(MAKE) install)
@INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install) @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install)
@ -546,6 +550,10 @@ install_win32: startup.yss
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi
mkdir -p $(DESTDIR)$(DOCSDIR)
$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)/README.TXT
$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)/COPYING.TXT
for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR) $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done

27
misc/yap.nsi Normal file → Executable file
View File

@ -29,7 +29,7 @@ ComponentText "This will install YAP on your computer."
DirText "This program will install YAP on your computer.\ DirText "This program will install YAP on your computer.\
Choose a directory" Choose a directory"
LicenseData c:\Yap\share\docs\Artistic LicenseData c:\Yap\share\docs\Yap\Artistic
LicenseText "YAP is governed by the Artistic License,\ LicenseText "YAP is governed by the Artistic License,\
but includes code under the GPL and LGPL." but includes code under the GPL and LGPL."
@ -53,16 +53,7 @@ Section "Base system (required)"
SetOutPath $INSTDIR\bin SetOutPath $INSTDIR\bin
; SYSTEM STUFF ; SYSTEM STUFF
File c:\Yap\lib\Yap\matrix.dll File c:\Yap\lib\Yap\*.dll
File c:\Yap\lib\Yap\plterm.dll
File c:\Yap\lib\Yap\random.dll
File c:\Yap\lib\Yap\regcomp.dll
File c:\Yap\lib\Yap\regerror.dll
File c:\Yap\lib\Yap\regexec.dll
File c:\Yap\lib\Yap\regexp.dll
File c:\Yap\lib\Yap\regfree.dll
File c:\Yap\lib\Yap\sys.dll
File c:\Yap\lib\Yap\yap_tries.dll
SetOutPath $INSTDIR\lib SetOutPath $INSTDIR\lib
; SYSTEM STUFF ; SYSTEM STUFF
@ -76,12 +67,12 @@ Section "Base system (required)"
; SYSTEM STUFF ; SYSTEM STUFF
File /r c:\Yap\share\Yap\* File /r c:\Yap\share\Yap\*
SetOutPath $INSTDIR\docs SetOutPath $INSTDIR\docs\Yap
File c:\Yap\share\docs\yap.html File c:\Yap\share\docs\Yap\yap.html
File c:\Yap\share\docs\yap.pdf File c:\Yap\share\docs\Yap\yap.pdf
File c:\Yap\share\docs\Artistic File c:\Yap\share\docs\Yap\Artistic
File c:\Yap\share\docs\README.TXT File c:\Yap\share\docs\Yap\README.TXT
File c:\Yap\share\docs\COPYING.TXT File c:\Yap\share\docs\Yap\COPYING.TXT
WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR" WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR"
WriteRegStr HKLM ${REGKEY} "startup" "$INSTDIR\lib\startup.yss" WriteRegStr HKLM ${REGKEY} "startup" "$INSTDIR\lib\startup.yss"
@ -277,4 +268,4 @@ Function .onInstFailed
installer, please contact yap-users@sf.net" installer, please contact yap-users@sf.net"
FunctionEnd FunctionEnd
outfile "yap-5.1.4-installer.exe" outfile "yap-6.0.0-installer.exe"

@ -1 +1 @@
Subproject commit 9f80255cce18ee268792631aa1180e19a496346f Subproject commit d9614e99dc98f8546fdc213c9e45003cf6efd520