HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mysql-fixperms
[hcoop/domtool2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
15a2272
..
f538e94
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,13
+1,16
@@
all: mlton
COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
all: mlton
COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
- openssl/openssl_sml.so
+ openssl/openssl_sml.so config.sml
+
+config.sml:
+ echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
.PHONY: all mlton smlnj install
mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
.PHONY: all mlton smlnj install
mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
- bin/smtplog bin/setsa
+ bin/smtplog bin/setsa
bin/mysql-fixperms
smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm
@@
-78,6
+81,10
@@
src/smtplog.mlb: src/prefix.mlb src/sources src/suffix.mlb
$(MAKE_MLB_BASE) >src/smtplog.mlb
echo "main-smtplog.sml" >>src/smtplog.mlb
$(MAKE_MLB_BASE) >src/smtplog.mlb
echo "main-smtplog.sml" >>src/smtplog.mlb
+src/mysql-fixperms.mlb: src/prefix.mlb src/sources src/suffix.mlb
+ $(MAKE_MLB_BASE) >src/mysql-fixperms.mlb
+ echo "main-mysql-fixperms.sml" >>src/mysql-fixperms.mlb
+
openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \
-cm libssl.h.cm -D__builtin_va_list="void*" \
openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h
cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \
-cm libssl.h.cm -D__builtin_va_list="void*" \
@@
-101,32
+108,41
@@
COMMON_MLTON_DEPS := openssl/mlton/FFI/libssl.h.mlb \
src/plugins/*.sig src/plugins/*.sml \
src/mail/*.sig src/mail/*.sml
src/plugins/*.sig src/plugins/*.sml \
src/mail/*.sig src/mail/*.sml
+MLTON := mlton -link-opt -ldl
+
+ifdef DEBUG
+ MLTON += -const 'Exn.keepHistory true'
+endif
+
bin/domtool-server: $(COMMON_MLTON_DEPS) src/domtool-server.mlb
bin/domtool-server: $(COMMON_MLTON_DEPS) src/domtool-server.mlb
-
mlton -output bin/domtool-server -link-opt -ldl
src/domtool-server.mlb
+
$(MLTON) -output bin/domtool-server
src/domtool-server.mlb
bin/domtool-client: $(COMMON_MLTON_DEPS) src/domtool-client.mlb
bin/domtool-client: $(COMMON_MLTON_DEPS) src/domtool-client.mlb
-
mlton -output bin/domtool-client -link-opt -ldl
src/domtool-client.mlb
+
$(MLTON) -output bin/domtool-client
src/domtool-client.mlb
bin/domtool-slave: $(COMMON_MLTON_DEPS) src/domtool-slave.mlb
bin/domtool-slave: $(COMMON_MLTON_DEPS) src/domtool-slave.mlb
-
mlton -output bin/domtool-slave -link-opt -ldl
src/domtool-slave.mlb
+
$(MLTON) -output bin/domtool-slave
src/domtool-slave.mlb
bin/domtool-admin: $(COMMON_MLTON_DEPS) src/domtool-admin.mlb
bin/domtool-admin: $(COMMON_MLTON_DEPS) src/domtool-admin.mlb
-
mlton -output bin/domtool-admin -link-opt -ldl
src/domtool-admin.mlb
+
$(MLTON) -output bin/domtool-admin
src/domtool-admin.mlb
bin/domtool-doc: $(COMMON_MLTON_DEPS) src/domtool-doc.mlb
bin/domtool-doc: $(COMMON_MLTON_DEPS) src/domtool-doc.mlb
-
mlton -output bin/domtool-doc -link-opt -ldl
src/domtool-doc.mlb
+
$(MLTON) -output bin/domtool-doc
src/domtool-doc.mlb
bin/dbtool: $(COMMON_MLTON_DEPS) src/dbtool.mlb
bin/dbtool: $(COMMON_MLTON_DEPS) src/dbtool.mlb
-
mlton -output bin/dbtool -link-opt -ld
l src/dbtool.mlb
+
$(MLTON) -output bin/dbtoo
l src/dbtool.mlb
bin/vmail: $(COMMON_MLTON_DEPS) src/vmail.mlb
bin/vmail: $(COMMON_MLTON_DEPS) src/vmail.mlb
-
mlton -output bin/vmail -link-opt -ld
l src/vmail.mlb
+
$(MLTON) -output bin/vmai
l src/vmail.mlb
bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
-
mlton -output bin/setsa -link-opt -ldl
src/setsa.mlb
+
$(MLTON) -output bin/setsa
src/setsa.mlb
bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
- mlton -output bin/smtplog -link-opt -ldl src/smtplog.mlb
+ $(MLTON) -output bin/smtplog src/smtplog.mlb
+
+bin/mysql-fixperms: $(COMMON_MLTON_DEPS) src/mysql-fixperms.mlb
+ $(MLTON) -output bin/mysql-fixperms src/mysql-fixperms.mlb
install:
cp scripts/domtool-publish /usr/local/sbin/
install:
cp scripts/domtool-publish /usr/local/sbin/
@@
-134,8
+150,14
@@
install:
cp scripts/domtool-reset-local /usr/local/sbin/
cp scripts/domtool-adduser /usr/local/bin/
cp scripts/domtool-addcert /usr/local/bin/
cp scripts/domtool-reset-local /usr/local/sbin/
cp scripts/domtool-adduser /usr/local/bin/
cp scripts/domtool-addcert /usr/local/bin/
+ cp scripts/domtool-addcert-daemon /usr/local/bin/
cp scripts/domtool-addacl /usr/local/bin/
cp scripts/domtool-rmuser /usr/local/bin/
cp scripts/domtool-addacl /usr/local/bin/
cp scripts/domtool-rmuser /usr/local/bin/
+ cp scripts/domtool-admin-sudo /usr/local/bin/
+ cp scripts/domtool-server-logged /usr/local/bin/
+ cp scripts/domtool-slave-logged /usr/local/bin/
+ cp scripts/domtool-server /etc/init.d/
+ cp scripts/domtool-slave /etc/init.d/
cp openssl/openssl_sml.so /usr/local/lib/
-cp bin/domtool-server /usr/local/sbin/
-cp bin/domtool-slave /usr/local/sbin/
cp openssl/openssl_sml.so /usr/local/lib/
-cp bin/domtool-server /usr/local/sbin/
-cp bin/domtool-slave /usr/local/sbin/
@@
-146,10
+168,21
@@
install:
-cp bin/vmail /usr/local/bin/
-cp bin/setsa /usr/local/bin/
-cp bin/smtplog /usr/local/bin/
-cp bin/vmail /usr/local/bin/
-cp bin/setsa /usr/local/bin/
-cp bin/smtplog /usr/local/bin/
+ -cp bin/mysql-fixperms /usr/local/bin/
cp src/plugins/domtool-postgres /usr/local/sbin/
cp src/plugins/domtool-mysql /usr/local/sbin/
cp src/plugins/domtool-postgres /usr/local/sbin/
cp src/plugins/domtool-mysql /usr/local/sbin/
-.PHONY: grab_lib
+.PHONY: grab_lib
install_server install_slave
grab_lib:
grab_lib:
- rsync --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+ rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+
+install_server:
+ sudo /etc/init.d/domtool-server stop
+ sudo make install
+ sudo /etc/init.d/domtool-server start
+
+install_slave:
+ sudo /etc/init.d/domtool-slave stop
+ sudo make install
+ sudo /etc/init.d/domtool-slave start