Skip to content

Add AppVeyor continuous integration #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Chris00 wants to merge 4 commits into from
Closed

Add AppVeyor continuous integration #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb2c0a
Protect install paths against spaces (on Windows)
Chris00 Nov 27, 2015
0857e9d
Add AppVeyor testing
Chris00 Nov 29, 2015
489ed28
Make AppVeyor run tests
Chris00 Dec 4, 2015
088f344
Avoid calling make recursively when "testsuite" is not present
Chris00 Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions Makefile.nt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,32 +185,33 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)
INSTALL_COMPLIBDIR=$(DESTDIR)$(COMPLIBDIR)
INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDIR)
INSTALL_MANDIR=$(DESTDIR)$(MANDIR)
INSTALL_DISTRIB=$(DESTDIR)$(PREFIX)

install: installbyt installopt

installbyt:
mkdir -p $(INSTALL_BINDIR)
mkdir -p $(INSTALL_LIBDIR)
mkdir -p $(INSTALL_STUBLIBDIR)
mkdir -p $(INSTALL_COMPLIBDIR)
cp VERSION $(INSTALL_LIBDIR)/
mkdir -p "$(INSTALL_BINDIR)"
mkdir -p "$(INSTALL_LIBDIR)"
mkdir -p "$(INSTALL_STUBLIBDIR)"
mkdir -p "$(INSTALL_COMPLIBDIR)"
cp VERSION "$(INSTALL_LIBDIR)/"
cd byterun ; $(MAKEREC) install
cp ocamlc $(INSTALL_BINDIR)/ocamlc.exe
cp ocaml $(INSTALL_BINDIR)/ocaml.exe
cp ocamlc "$(INSTALL_BINDIR)/ocamlc.exe"
cp ocaml "$(INSTALL_BINDIR)/ocaml.exe"
cd stdlib ; $(MAKEREC) install
cp lex/ocamllex $(INSTALL_BINDIR)/ocamllex.exe
cp yacc/ocamlyacc.exe $(INSTALL_BINDIR)/ocamlyacc.exe
cp lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.exe"
cp yacc/ocamlyacc.exe "$(INSTALL_BINDIR)/ocamlyacc.exe"
cp utils/*.cmi utils/*.cmt utils/*.cmti \
parsing/*.cmi parsing/*.cmt parsing/*.cmti \
typing/*.cmi typing/*.cmt typing/*.cmti \
bytecomp/*.cmi bytecomp/*.cmt bytecomp/*.cmti \
driver/*.cmi driver/*.cmt driver/*.cmti \
toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti $(INSTALL_COMPLIBDIR)
toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti "$(INSTALL_COMPLIBDIR)"
cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
$(INSTALL_COMPLIBDIR)
cp expunge $(INSTALL_LIBDIR)/expunge.exe
cp toplevel/topdirs.cmi $(INSTALL_LIBDIR)
"$(INSTALL_COMPLIBDIR)"
cp expunge "$(INSTALL_LIBDIR)/expunge.exe"
cp toplevel/topdirs.cmi "$(INSTALL_LIBDIR)"
cd tools ; $(MAKEREC) install
for i in $(OTHERLIBRARIES); do \
$(MAKEREC) -C otherlibs/$$i install || exit $$?; \
Expand All @@ -223,11 +224,11 @@ installbyt:
else :; fi
if test -n "$(FLEXDLL_SUBMODULE_PRESENT)"; then $(MAKEREC) install-flexdll; \
else :; fi
cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config
cp README.adoc $(INSTALL_DISTRIB)/Readme.general.txt
cp README.win32.adoc $(INSTALL_DISTRIB)/Readme.windows.txt
cp LICENSE $(INSTALL_DISTRIB)/License.txt
cp Changes $(INSTALL_DISTRIB)/Changes.txt
cp config/Makefile "$(INSTALL_LIBDIR)/Makefile.config"
cp README.adoc "$(INSTALL_DISTRIB)/Readme.general.txt"
cp README.win32.adoc "$(INSTALL_DISTRIB)/Readme.windows.txt"
cp LICENSE "$(INSTALL_DISTRIB)/License.txt"
cp Changes "$(INSTALL_DISTRIB)/Changes.txt"

install-flexdll:
# The $(if ...) installs the correct .manifest file for MSVC and MSVC64
Expand All @@ -238,14 +239,14 @@ install-flexdll:
# Installation of the native-code compiler
installopt:
cd asmrun ; $(MAKEREC) install
cp ocamlopt $(INSTALL_BINDIR)/ocamlopt.exe
cp ocamlopt "$(INSTALL_BINDIR)/ocamlopt.exe"
cd stdlib ; $(MAKEREC) installopt
cp middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \
$(INSTALL_COMPLIBDIR)
"$(INSTALL_COMPLIBDIR)"
cp middle_end/base_types/*.cmi middle_end/base_types/*.cmt \
middle_end/base_types/*.cmti $(INSTALL_COMPLIBDIR)
cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
middle_end/base_types/*.cmti "$(INSTALL_COMPLIBDIR)"
cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti "$(INSTALL_COMPLIBDIR)"
cp compilerlibs/ocamloptcomp.cma $(OPTSTART) "$(INSTALL_COMPLIBDIR)"
if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKEREC) installopt); fi
if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \
else :; fi
Expand All @@ -257,17 +258,24 @@ installopt:
if test -f ocamlopt.opt -a -f flexdll/flexlink.opt ; then cp -f flexdll/flexlink.opt $(INSTALL_BINDIR)/flexlink.exe ; fi

installoptopt:
cp ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE)
cp ocamlopt.opt $(INSTALL_BINDIR)/ocamlopt.opt$(EXE)
cp lex/ocamllex.opt $(INSTALL_BINDIR)/ocamllex.opt$(EXE)
cp ocamlc.opt "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)"
cp ocamlopt.opt "$(INSTALL_BINDIR)/ocamlopt.opt$(EXE)"
cp lex/ocamllex.opt "$(INSTALL_BINDIR)/ocamllex.opt$(EXE)"
cp utils/*.cmx parsing/*.cmx typing/*.cmx bytecomp/*.cmx \
driver/*.cmx asmcomp/*.cmx $(INSTALL_COMPLIBDIR)
driver/*.cmx asmcomp/*.cmx "$(INSTALL_COMPLIBDIR)"
cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.$(A) \
compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.$(A) \
compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.$(A) \
$(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.$(O)) \
$(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.$(O)) \
$(INSTALL_COMPLIBDIR)
"$(INSTALL_COMPLIBDIR)"

# Run all tests

tests: opt.opt
cd testsuite && $(MAKE) clean && $(MAKE) all

# The clean target

clean:: partialclean

Expand Down
56 changes: 56 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Compile the 64 bits version
platform:
- x64

branches:
only:
- trunk

# Do a shallow clone of the repo to speed up the build
clone_depth: 1

environment:
global:
CYG_ROOT: C:/cygwin
CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
CYG_CACHE: C:/cygwin/var/cache/setup
OCAMLROOT: "%PROGRAMFILES%/OCaml"

cache:
- C:\cygwin\var\cache\setup

install:
- mkdir "%OCAMLROOT%"
- mkdir "%OCAMLROOT%/bin"
- mkdir "%OCAMLROOT%/bin/flexdll"
- appveyor DownloadFile "http://alain.frisch.fr/flexdll/flexdll-bin-0.34.zip" -FileName "flexdll.zip"
- cinst 7zip.commandline
- 7za x -y flexdll.zip
- for %%F in (*.c *.h *.exe *.o *.obj) do copy %%F "%OCAMLROOT%\bin\flexdll"
# Make sure the Cygwin path comes before the Git one (otherwise
# cygpath behaves crazily), but after the MSVC one.
- set Path=C:\cygwin\bin;%Path%
- '"%CYG_ROOT%\setup-x86.exe" -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P diffutils -P dos2unix -P gcc-core -P make -P ncurses >NUL'
- '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
- call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- set Path=%OCAMLROOT%\bin;%OCAMLROOT%\bin\flexdll;%Path%

build_script:
- set PFPATH=%PROGRAMFILES%
- set FLEXDLLDIR=%OCAMLROOT%\bin\flexdll
- echo VCPATH="`cygpath -p '%Path%'`" > %CYG_ROOT%\tmp\msenv
- echo LIB="%LIB%" >> %CYG_ROOT%\tmp\msenv
- echo LIBPATH="%LIBPATH%" >> %CYG_ROOT%\tmp\msenv
- echo INCLUDE="%INCLUDE%;%FLEXDLLDIR%" >> %CYG_ROOT%\tmp\msenv
- echo FLPATH="`cygpath '%FLEXDLLDIR%'`" >> %CYG_ROOT%\tmp\msenv
- echo PATH="$VCPATH:$FLPATH:$PATH" >> %CYG_ROOT%\tmp\msenv
- echo export PATH LIB LIBPATH INCLUDE >> %CYG_ROOT%\tmp\msenv
- echo export OCAMLBUILD_FIND=/usr/bin/find >> %CYG_ROOT%\tmp\msenv
- "%CYG_ROOT%/bin/bash -lc \"tr -d '\\r' </tmp/msenv > ~/.msenv64\""
- "%CYG_ROOT%/bin/bash -lc \"echo '. ~/.msenv64' >> ~/.bash_profile\""
- '%CYG_ROOT%/bin/bash -lc "$APPVEYOR_BUILD_FOLDER/appveyor_build.sh"'

test_script:
- ocamlc -version
- set CAML_LD_LIBRARY_PATH=%OCAMLROOT%/lib/stublibs
- '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER && make -f Makefile.nt tests"'
34 changes: 34 additions & 0 deletions appveyor_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash

function run {
NAME=$1
shift
echo "-=-=- $NAME -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"
$@
CODE=$?
if [ $CODE -ne 0 ]; then
echo "-=-=- $NAME failed! -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"
exit $CODE
else
echo "-=-=- End of $NAME -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"
fi
}

cd $APPVEYOR_BUILD_FOLDER

cp config/m-nt.h config/m.h
cp config/s-nt.h config/s.h
#cp config/Makefile.msvc config/Makefile
cp config/Makefile.msvc64 config/Makefile

PREFIX="C:/Program Files/OCaml"
echo "Edit config/Makefile so set PREFIX=$PREFIX"
cp config/Makefile config/Makefile.bak
sed -e "s|PREFIX=.*|PREFIX=$PREFIX|" config/Makefile.bak > config/Makefile
#run "Content of config/Makefile" cat config/Makefile

run "make world" make -f Makefile.nt world
run "make bootstrap" make -f Makefile.nt bootstrap
run "make opt" make -f Makefile.nt opt
run "make opt.opt" make -f Makefile.nt opt.opt
run "make install" make -f Makefile.nt install
2 changes: 1 addition & 1 deletion asmrun/Makefile.nt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ amd64.o: amd64.S
INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)

install:
cp libasmrun.$(A) $(INSTALL_LIBDIR)
cp libasmrun.$(A) "$(INSTALL_LIBDIR)"

$(LINKEDFILES): %.c: ../byterun/%.c
cp ../byterun/$*.c $*.c
Expand Down
6 changes: 3 additions & 3 deletions byterun/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ install-noshared:
.PHONY: install-noshared

install-shared:
cp libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so
cp libcamlrun_pic.a $(INSTALL_LIBDIR)/libcamlrun_pic.a
cd $(INSTALL_LIBDIR); $(RANLIB) libcamlrun_pic.a
cp libcamlrun_shared.so "$(INSTALL_LIBDIR)/libcamlrun_shared.so"
cp libcamlrun_pic.a "$(INSTALL_LIBDIR)/libcamlrun_pic.a"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) libcamlrun_pic.a
.PHONY: install-shared

clean::
Expand Down
18 changes: 9 additions & 9 deletions byterun/Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR)


install::
cp $(CAMLRUN)$(EXE) $(INSTALL_BINDIR)/ocamlrun$(EXE)
cp libcamlrun.$(A) $(INSTALL_LIBDIR)/libcamlrun.$(A)
cd $(INSTALL_LIBDIR); $(RANLIB) libcamlrun.$(A)
if test -d $(INSTALL_LIBDIR)/caml; then : ; \
else mkdir $(INSTALL_LIBDIR)/caml; fi
cp $(CAMLRUN)$(EXE) "$(INSTALL_BINDIR)/ocamlrun$(EXE)"
cp libcamlrun.$(A) "$(INSTALL_LIBDIR)/libcamlrun.$(A)"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) libcamlrun.$(A)
if test -d "$(INSTALL_LIBDIR)/caml"; then : ; \
else mkdir "$(INSTALL_LIBDIR)/caml"; fi
for i in $(PUBLIC_INCLUDES); do \
sed -f ../tools/cleanup-header caml/$$i > $(INSTALL_LIBDIR)/caml/$$i; \
sed -f ../tools/cleanup-header caml/$$i > "$(INSTALL_LIBDIR)/caml/$$i"; \
done
cp ld.conf $(INSTALL_LIBDIR)/ld.conf
cp ld.conf "$(INSTALL_LIBDIR)/ld.conf"
.PHONY: install

install:: install-$(RUNTIMED)
Expand All @@ -84,8 +84,8 @@ install-noruntimed:
# because it's an executable for the target machine, while we're installing
# binaries for the host.
install-runtimed:
cp ocamlrund$(EXE) $(INSTALL_BINDIR)/ocamlrund$(EXE)
cp libcamlrund.$(A) $(INSTALL_LIBDIR)/libcamlrund.$(A)
cp ocamlrund$(EXE) "$(INSTALL_BINDIR)/ocamlrund$(EXE)"
cp libcamlrund.$(A) "$(INSTALL_LIBDIR)/libcamlrund.$(A)"
.PHONY: install-runtimed

ifeq "$(RUNTIMEI)" "true"
Expand Down
2 changes: 1 addition & 1 deletion debugger/Makefile.shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)

install:
cp ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE)
cp ocamldebug$(EXE) "$(INSTALL_BINDIR)/ocamldebug$(EXE)"

clean::
rm -f ocamldebug$(EXE)
Expand Down
16 changes: 8 additions & 8 deletions ocamlbuild/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,19 +168,19 @@ beforedepend:: glob_lexer.ml
# Installation

install:
$(CP) ocamlbuild.byte $(INSTALL_BINDIR)/ocamlbuild$(EXE)
$(CP) ocamlbuild.byte $(INSTALL_BINDIR)/ocamlbuild.byte$(EXE)
mkdir -p $(INSTALL_LIBDIR)
$(CP) $(INSTALL_LIB) $(INSTALL_LIBDIR)/
$(CP) ocamlbuild.byte "$(INSTALL_BINDIR)/ocamlbuild$(EXE)"
$(CP) ocamlbuild.byte "$(INSTALL_BINDIR)/ocamlbuild.byte$(EXE)"
mkdir -p "$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_LIB) "$(INSTALL_LIBDIR)/"

installopt:
if test -f ocamlbuild.native; then $(MAKE) installopt_really; fi

installopt_really:
$(CP) ocamlbuild.native $(INSTALL_BINDIR)/ocamlbuild$(EXE)
$(CP) ocamlbuild.native $(INSTALL_BINDIR)/ocamlbuild.native$(EXE)
mkdir -p $(INSTALL_LIBDIR)
$(CP) $(INSTALL_LIB_OPT) $(INSTALL_LIBDIR)/
$(CP) ocamlbuild.native "$(INSTALL_BINDIR)/ocamlbuild$(EXE)"
$(CP) ocamlbuild.native "$(INSTALL_BINDIR)/ocamlbuild.native$(EXE)"
mkdir -p "$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_LIB_OPT) "$(INSTALL_LIBDIR)/"

# The generic rules

Expand Down
26 changes: 13 additions & 13 deletions ocamldoc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,24 +253,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
# Installation targets
######################
install: dummy
if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
if test -d $(INSTALL_CUSTOMDIR); then : ; else $(MKDIR) $(INSTALL_CUSTOMDIR); fi
$(CP) $(OCAMLDOC) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
if test -d "$(INSTALL_BINDIR)"; then : ; else $(MKDIR) "$(INSTALL_BINDIR)"; fi
if test -d "$(INSTALL_LIBDIR)"; then : ; else $(MKDIR) "$(INSTALL_LIBDIR)"; fi
if test -d "$(INSTALL_CUSTOMDIR)"; then : ; else $(MKDIR) "$(INSTALL_CUSTOMDIR)"; fi
$(CP) $(OCAMLDOC) "$(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)"
$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) "$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"
if test -d "$(INSTALL_MANODIR)"; then : ; else $(MKDIR) "$(INSTALL_MANODIR)"; fi
if test -d stdlib_man; then $(CP) stdlib_man/* "$(INSTALL_MANODIR)"; else : ; fi

installopt:
if test -f $(OCAMLDOC_OPT); then $(MAKE) installopt_really ; fi

installopt_really:
if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
$(CP) $(OCAMLDOC_OPT) $(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)
$(CP) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
if test -d "$(INSTALL_BINDIR)"; then : ; else $(MKDIR) "$(INSTALL_BINDIR)"; fi
if test -d "$(INSTALL_LIBDIR)"; then : ; else $(MKDIR) "$(INSTALL_LIBDIR)"; fi
$(CP) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)"
$(CP) ocamldoc.hva *.cmx $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) "$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"

# Testing :
###########
Expand Down
21 changes: 11 additions & 10 deletions ocamldoc/Makefile.nt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,22 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
# Installation targets
######################
install: dummy
$(MKDIR) -p $(INSTALL_BINDIR)
$(MKDIR) -p $(INSTALL_LIBDIR)
$(CP) $(OCAMLDOC) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
$(MKDIR) -p "$(INSTALL_BINDIR)"
$(MKDIR) -p "$(INSTALL_LIBDIR)"
$(CP) $(OCAMLDOC) "$(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)"
$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) "$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"

installopt:
if test -f $(OCAMLDOC_OPT); then $(MAKEREC) installopt_really; fi

installopt_really:
$(MKDIR) -p $(INSTALL_BINDIR)
$(MKDIR) -p $(INSTALL_LIBDIR)
$(CP) $(OCAMLDOC_OPT) $(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)
$(CP) ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR)
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
$(MKDIR) -p "$(INSTALL_BINDIR)"
$(MKDIR) -p "$(INSTALL_LIBDIR)"
$(CP) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE)"
$(CP) ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) \
"$(INSTALL_LIBDIR)"
$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) "$(INSTALL_LIBDIR)"


# backup, clean and depend :
Expand Down
18 changes: 10 additions & 8 deletions otherlibs/Makefile.shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,18 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDIR)

install::
if test -f dll$(CLIBNAME)$(EXT_DLL); then \
cp dll$(CLIBNAME)$(EXT_DLL) $(INSTALL_STUBLIBDIR)/; fi
cp lib$(CLIBNAME).$(A) $(INSTALL_LIBDIR)/
cd $(INSTALL_LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(INSTALL_LIBDIR)/
if test -n "$(HEADERS)"; then cp $(HEADERS) $(INSTALL_LIBDIR)/caml/; fi
cp dll$(CLIBNAME)$(EXT_DLL) "$(INSTALL_STUBLIBDIR)/"; fi
cp lib$(CLIBNAME).$(A) "$(INSTALL_LIBDIR)/"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) lib$(CLIBNAME).$(A)
cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) "$(INSTALL_LIBDIR)/"
if test -n "$(HEADERS)"; then \
cp $(HEADERS) "$(INSTALL_LIBDIR)/caml/"; fi

installopt:
cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALL_LIBDIR)/
cd $(INSTALL_LIBDIR); $(RANLIB) $(LIBNAME).a
if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(INSTALL_LIBDIR)/; fi
cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) "$(INSTALL_LIBDIR)/"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) $(LIBNAME).a
if test -f $(LIBNAME).cmxs; then \
cp $(LIBNAME).cmxs "$(INSTALL_LIBDIR)/"; fi

partialclean:
rm -f *.cm*
Expand Down
Loading