[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef... |
|
Date: |
Sun, 03 Feb 2008 23:06:30 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 08/02/03 23:06:30
Modified files:
config : Makefile.config.in Makefile.in configure.in
distrib : ChangeLog
Log message:
patch #6395
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.config.in?cvsroot=mldonkey&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.183&r2=1.184
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.311&r2=1.312
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1350&r2=1.1351
Patches:
Index: config/Makefile.config.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.config.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- config/Makefile.config.in 23 Oct 2006 12:18:27 -0000 1.63
+++ config/Makefile.config.in 3 Feb 2008 23:06:30 -0000 1.64
@@ -46,6 +46,7 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
@@ -85,4 +86,3 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- config/Makefile.in 10 Oct 2007 21:50:32 -0000 1.183
+++ config/Makefile.in 3 Feb 2008 23:06:30 -0000 1.184
@@ -572,172 +572,9 @@
#######################################################################
-CONTESTER_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- src/contest/pass.c src/contest/contester.ml
-
-SAFEEXEC_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- src/contest/pass.c src/contest/safeexec.ml
-
-MLPIC_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- src/pic/picTypes.ml \
- src/pic/picOptions.ml \
- src/pic/picGlobals.ml \
- src/pic/picDB.ml \
- src/pic/picGenerator.ml \
- src/pic/picThemeFrames.ml \
- src/pic/picThemeFilm.ml \
- src/pic/picThemeEditor.ml \
- src/pic/picThemeAlbum.ml \
- src/pic/picHttp.ml \
- src/pic/picMain.ml
-
-ifeq ("$(TMK)" , "yes")
-TMK_SRCS= \
- src/spider/tmk/ml_curses.c \
- src/spider/tmk/curses.mlcpp \
- \
- src/spider/tmk/tmkStruct.ml \
- src/spider/tmk/tmkArea.ml \
- src/spider/tmk/tmkStyle.ml \
- src/spider/tmk/tmkStyle_p.mly \
- src/spider/tmk/tmkStyle_l.mll \
- src/spider/tmk/tmkSignal.ml \
- src/spider/tmk/tmkTerminal.ml \
- src/spider/tmk/tmkMain.ml \
- src/spider/tmk/tmkWidget.ml \
- src/spider/tmk/tmkContainer.ml \
- src/spider/tmk/tmkPacking.ml \
- src/spider/tmk/tmkMisc.ml \
- src/spider/tmk/tmkButton.ml \
- src/spider/tmk/tmkList.ml \
- src/spider/tmk/tmkEntry.ml \
- src/spider/tmk/tmkFrame.ml \
-
-DISASM_SRCS= \
- $(TMK_SRCS) \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- src/spider/disasm/ansi.c \
- src/spider/disasm/asmserv.c \
- src/spider/disasm/assembl.c \
- src/spider/disasm/disasm.c \
- src/spider/disasm/mldisasm_c.c \
- src/spider/disasm/mldisasm.ml \
- src/spider/disasm/aSMmain.ml \
-
-
-endif
-
-
-SPIDER_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- $(MP3TAG_SRCS) $(CHAT_SRCS) $(COMMON_SRCS) $(COMMON_CLIENT_SRCS) \
- \
- src/spider/ecrawler/spiderTypes.ml \
- src/spider/ecrawler/spiderOptions.ml \
- $(SRC_DONKEY)/donkeyTypes.ml \
- $(SRC_DONKEY)/donkeyMftp.ml \
- $(SRC_DONKEY)/donkeyImport.ml \
- $(SRC_DONKEY)/donkeyOpenProtocol.ml \
- $(SRC_DONKEY)/donkeyProtoClient.ml \
- $(SRC_DONKEY)/donkeyProtoServer.ml \
- $(SRC_DONKEY)/donkeyProtoUdp.ml \
- \
- src/spider/ecrawler/spiderGlobals.ml \
- src/spider/ecrawler/spiderArgs.ml \
- src/spider/ecrawler/spiderProtoCom.ml \
- \
- src/spider/ecrawler/spiderComplexOptions.ml \
- src/spider/ecrawler/spiderSupernode.ml \
- src/spider/ecrawler/spiderIndexer.ml \
- src/spider/ecrawler/spiderShare.ml \
- src/spider/ecrawler/spiderReliability.ml \
- src/spider/ecrawler/spiderOneFile.ml \
- src/spider/ecrawler/spiderClient.ml \
- \
- src/spider/ecrawler/spiderTrap.ml \
- src/spider/ecrawler/spiderOvernet.ml \
- src/spider/ecrawler/spiderServers.ml \
- src/spider/ecrawler/spiderSearch.ml \
- src/spider/ecrawler/spiderInteractive.ml \
- \
- src/spider/ecrawler/spiderMain.ml \
- src/daemon/common/commonMain.ml
-
TESTRSS_SRCS= \
$(CDK_SRCS) $(LIB_SRCS) tools/testrss.ml
-CLUSTER_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- src/cluster/clusterMain.ml
-
-ANALYSER1_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- $(MP3TAG_SRCS) $(CHAT_SRCS) $(COMMON_SRCS) $(COMMON_CLIENT_SRCS) \
- \
- src/spider/ecrawler/spiderTypes.ml \
- src/spider/ecrawler/spiderOptions.ml \
- $(SRC_DONKEY)/donkeyTypes.ml \
- $(SRC_DONKEY)/donkeyMftp.ml \
- $(SRC_DONKEY)/donkeyImport.ml \
- $(SRC_DONKEY)/donkeyOpenProtocol.ml \
- $(SRC_DONKEY)/donkeyProtoClient.ml \
- $(SRC_DONKEY)/donkeyProtoServer.ml \
- $(SRC_DONKEY)/donkeyProtoUdp.ml \
- \
- src/spider/ecrawler/spiderGlobals.ml \
- src/spider/ecrawler/spiderArgs.ml \
- src/spider/ecrawler/spiderProtoCom.ml \
- \
- src/spider/ecrawler/spiderComplexOptions.ml \
- src/spider/ecrawler/spiderSupernode.ml \
- src/spider/ecrawler/spiderIndexer.ml \
- src/spider/ecrawler/spiderShare.ml \
- src/spider/ecrawler/spiderReliability.ml \
- src/spider/ecrawler/spiderOneFile.ml \
- \
- src/spider/analyser1/spiderDependencies.ml \
- src/spider/analyser1/spiderUtils.ml \
- src/spider/analyser1/spiderFiles.ml \
- src/spider/analyser1/spiderGenTables.ml \
- src/spider/analyser1/spiderTables.ml \
- src/spider/analyser1/spiderChunks.ml \
- src/spider/analyser1/spiderCommands.ml \
- src/spider/analyser1/spiderClustering.ml \
- src/spider/analyser1/spiderCorruption.ml \
- src/spider/analyser1/spiderRoutes.ml \
- src/spider/analyser1/spiderStats.ml \
- \
- src/spider/analyser1/analyser1Main.ml \
- src/daemon/common/commonMain.ml
-
-BTVIEW_SRCS= \
- $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
- $(MP3TAG_SRCS) \
- \
- $(COMMON)/commonTypes.ml \
- $(COMMON)/commonOptions.ml \
- $(COMMON)/commonMessages.ml \
- $(COMMON)/commonUserDb.ml \
- $(COMMON)/commonGlobals.ml \
- $(COMMON)/commonWeb.ml \
- $(COMMON)/commonHasher.ml \
- $(COMMON)/commonSwarming.ml \
- $(COMMON)/commonHasher_c.c \
- \
- $(SRC_BITTORRENT)/bencode.ml \
- $(SRC_BITTORRENT)/bTProtocol.ml \
- src/btview/btviewTypes.ml \
- src/btview/btviewGlobals.ml \
- src/btview/btviewOptions.ml \
- src/btview/btviewClients.ml \
- src/btview/btviewInteractive.ml \
- \
- src/btview/btviewMain.ml \
- src/daemon/common/commonMain.ml
-
#######################################################################
@@ -1704,19 +1541,16 @@
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
for i in $(RELEASE_TARGETS); do \
- cp -f $$i $(DISDIR)/$$i && strip $(DISDIR)/$$i; \
+ cp -f $$i $(DISDIR)/$$i && \
+ if [ "$(SYSTEM)" != "macos" ]; then \
+ strip $(DISDIR)/$$i; \
+ fi \
done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
-upload.shared: release.shared
- scp mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
-
-upload.shared.rcp: release.shared
- rcp mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
-
release.static: static opt
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
@@ -1749,8 +1583,12 @@
release.mlnet.distri: mlnet mlnet.static
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
- cp mlnet $(DISDIR)/mlnet && strip $(DISDIR)/mlnet
- cp mlnet.static $(DISDIR)/mlnet.static && strip $(DISDIR)/mlnet.static
+ for i in "mlnet mlnet.static"; do \
+ cp -f $$i $(DISDIR)/$$i && \
+ if [ "$(SYSTEM)" != "macos" ]; then \
+ strip $(DISDIR)/$$i; \
+ fi \
+ done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
@@ -1759,8 +1597,12 @@
release.utils.shared: mld_hash make_torrent
rm -rf mldonkey-*
mkdir -p $(DISDIR)
- cp -f mld_hash $(DISDIR)/mld_hash && strip $(DISDIR)/mld_hash
- cp -f make_torrent $(DISDIR)/make_torrent && strip
$(DISDIR)/make_torrent
+ for i in "mld_hash make_torrent"; do \
+ cp -f $$i $(DISDIR)/$$i && \
+ if [ "$(SYSTEM)" != "macos" ]; then \
+ strip $(DISDIR)/$$i; \
+ fi \
+ done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar
mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
@@ -1776,21 +1618,11 @@
mv $(DISDIR).tar
mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`$(GLIBC_VERSION_ARCH).tar
-upload.static: release.static
- scp mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
-
-upload.static.rcp: release.static
- rcp mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
-
-
release.sources:
rm -rf **/CVS
rm -f config/Makefile.config
cd ..; tar zcf mldonkey-$(CURRENT_VERSION).sources.tar.gz mldonkey
-upload.sources: release.sources
- scp ../mldonkey-$(CURRENT_VERSION).sources.tar.gz
lachesis:devel/mldonkey-release/
-
distrib: $(DISDIR)
$(DISDIR): static distrib/Readme.txt
@@ -1804,17 +1636,6 @@
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname
-s`.tar
bzip2 mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s`.tar
-macosx: opt distrib/Readme.txt
- rm -rf mldonkey-*
- cp -R distrib $(DISDIR)
- rm -rf $(DISDIR)/CVS
- for i in $(RELEASE_TARGETS); do \
- cp $$i $(DISDIR)/$$i && strip $(DISDIR)/$$i; \
- done
- tar cf $(DISDIR).tar $(DISDIR)
- mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.ppc-MacOS-X.tar
- gzip mldonkey-$(CURRENT_VERSION).shared.ppc-MacOS-X.tar
-
SHADIR=mldonkey-shared
shared: $(SHADIR)
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -b -r1.311 -r1.312
--- config/configure.in 19 Jan 2008 14:37:04 -0000 1.311
+++ config/configure.in 3 Feb 2008 23:06:30 -0000 1.312
@@ -1340,8 +1340,6 @@
OCAMLDEP_OPTIONS="-slash"
fi
-TMK=no
-
AC_SUBST(LIBS)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
@@ -1402,7 +1400,6 @@
AC_SUBST(OS_FILES2)
AC_SUBST(TARGET_TYPE)
AC_SUBST(RPMBUILD)
-AC_SUBST(TMK)
AC_SUBST(GTKCFLAGS)
AC_SUBST(GTKLLIBS)
AC_SUBST(GTKLFLAGS)
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1350
retrieving revision 1.1351
diff -u -b -r1.1350 -r1.1351
--- distrib/ChangeLog 24 Jan 2008 14:43:37 -0000 1.1350
+++ distrib/ChangeLog 3 Feb 2008 23:06:30 -0000 1.1351
@@ -14,6 +14,9 @@
ChangeLog
=========
+2008/02/04
+6395: Makefile: Do not strip shared linked binaries on Mac OS X, clean Makefile
+
2008/01/24
6381: Multiuser: Block commands "shares" and "share" for non-admin users
-------------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...,
mldonkey-commits <=