Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved to utils

This commit is contained in:
Frank Celler 2012-08-31 09:31:39 +02:00
parent 6d38486be1
commit 5f16b7bfbe
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -164,3 +164,4 @@ UnitTests/Philadelphia/Runner.cpp
.v8-build-* .v8-build-*
VC++ VC++
.zeromq-build-* .zeromq-build-*
etc/arangodb/*.conf

24
Makefile.in
View File

@ -192,7 +192,7 @@ target_triplet = @target@
@ENABLE_MRUBY_TRUE@am__append_5 = @MRUBY_CPPFLAGS@ @MRUBY_LDFLAGS@ @ENABLE_MRUBY_TRUE@am__append_5 = @MRUBY_CPPFLAGS@ @MRUBY_LDFLAGS@
@ENABLE_MRUBY_TRUE@am__append_6 = @MRUBY_LIBS@ @ENABLE_MRUBY_TRUE@am__append_6 = @MRUBY_LIBS@
sbin_PROGRAMS = bin/arangod$(EXEEXT) bin/arango-password$(EXEEXT) \ sbin_PROGRAMS = bin/arangod$(EXEEXT) bin/arango-password$(EXEEXT) \
bin/arango-dfdb$(EXEEXT) bin/arango-dfdb$(EXEEXT) bin/arango-upgrade$(EXEEXT)
bin_PROGRAMS = bin/arangosh$(EXEEXT) bin/arangoimp$(EXEEXT) \ bin_PROGRAMS = bin/arangosh$(EXEEXT) bin/arangoimp$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_1)
noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
@ -594,6 +594,9 @@ bin_arango_dfdb_LDADD = $(LDADD)
am_bin_arango_password_OBJECTS = am_bin_arango_password_OBJECTS =
bin_arango_password_OBJECTS = $(am_bin_arango_password_OBJECTS) bin_arango_password_OBJECTS = $(am_bin_arango_password_OBJECTS)
bin_arango_password_LDADD = $(LDADD) bin_arango_password_LDADD = $(LDADD)
am_bin_arango_upgrade_OBJECTS =
bin_arango_upgrade_OBJECTS = $(am_bin_arango_upgrade_OBJECTS)
bin_arango_upgrade_LDADD = $(LDADD)
am__bin_arangod_SOURCES_DIST = arangod/Actions/actions.cpp \ am__bin_arangod_SOURCES_DIST = arangod/Actions/actions.cpp \
arangod/Actions/ActionDispatcherThread.cpp \ arangod/Actions/ActionDispatcherThread.cpp \
arangod/Actions/RestActionHandler.cpp \ arangod/Actions/RestActionHandler.cpp \
@ -800,10 +803,10 @@ SOURCES = $(lib_libarango_a_SOURCES) $(lib_libarango_client_a_SOURCES) \
$(lib_libarango_v8_a_SOURCES) \ $(lib_libarango_v8_a_SOURCES) \
$(UnitTests_basics_suite_SOURCES) \ $(UnitTests_basics_suite_SOURCES) \
$(UnitTests_geo_suite_SOURCES) $(bin_arango_dfdb_SOURCES) \ $(UnitTests_geo_suite_SOURCES) $(bin_arango_dfdb_SOURCES) \
$(bin_arango_password_SOURCES) $(bin_arangod_SOURCES) \ $(bin_arango_password_SOURCES) $(bin_arango_upgrade_SOURCES) \
$(bin_arangoimp_SOURCES) $(bin_arangoirb_SOURCES) \ $(bin_arangod_SOURCES) $(bin_arangoimp_SOURCES) \
$(bin_arangosh_SOURCES) $(bin_zclient_SOURCES) \ $(bin_arangoirb_SOURCES) $(bin_arangosh_SOURCES) \
$(bin_zserver_SOURCES) $(bin_zclient_SOURCES) $(bin_zserver_SOURCES)
DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \ DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \
$(lib_libarango_client_a_SOURCES) \ $(lib_libarango_client_a_SOURCES) \
$(lib_libarango_fe_a_SOURCES) \ $(lib_libarango_fe_a_SOURCES) \
@ -812,9 +815,10 @@ DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \
$(am__UnitTests_basics_suite_SOURCES_DIST) \ $(am__UnitTests_basics_suite_SOURCES_DIST) \
$(am__UnitTests_geo_suite_SOURCES_DIST) \ $(am__UnitTests_geo_suite_SOURCES_DIST) \
$(bin_arango_dfdb_SOURCES) $(bin_arango_password_SOURCES) \ $(bin_arango_dfdb_SOURCES) $(bin_arango_password_SOURCES) \
$(am__bin_arangod_SOURCES_DIST) $(bin_arangoimp_SOURCES) \ $(bin_arango_upgrade_SOURCES) $(am__bin_arangod_SOURCES_DIST) \
$(am__bin_arangoirb_SOURCES_DIST) $(bin_arangosh_SOURCES) \ $(bin_arangoimp_SOURCES) $(am__bin_arangoirb_SOURCES_DIST) \
$(bin_zclient_SOURCES) $(bin_zserver_SOURCES) $(bin_arangosh_SOURCES) $(bin_zclient_SOURCES) \
$(bin_zserver_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -1505,8 +1509,6 @@ bin_arangoimp_SOURCES = \
arangosh/V8Client/arangoimp.cpp arangosh/V8Client/arangoimp.cpp
# bin/arango-upgrade
################################################################################ ################################################################################
### @brief arango password ### @brief arango password
################################################################################ ################################################################################
@ -5295,7 +5297,7 @@ bin/arango-password: utils/arango-password.in
$< > $@ $< > $@
chmod 755 $@ chmod 755 $@
bin/arango-upgrade: bin/arango-upgrade.in bin/arango-upgrade: utils/arango-upgrade.in
sed \ sed \
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \ -e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \ -e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \

7
utils/Makefile.files
View File

@ -10,9 +10,8 @@
sbin_PROGRAMS += \ sbin_PROGRAMS += \
bin/arango-password \ bin/arango-password \
bin/arango-dfdb bin/arango-dfdb \
bin/arango-upgrade
# bin/arango-upgrade
################################################################################ ################################################################################
### @brief arango password ### @brief arango password
@ -38,7 +37,7 @@ CLEANUP += bin/arango-password
# exclude arango skripts from sources list # exclude arango skripts from sources list
bin_arango_upgrade_SOURCES = bin_arango_upgrade_SOURCES =
bin/arango-upgrade: bin/arango-upgrade.in bin/arango-upgrade: utils/arango-upgrade.in
sed \ sed \
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \ -e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \ -e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \

0
bin/arango-upgrade.in → utils/arango-upgrade.in
View File