wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from cie/flow-packages 

<rdar://33191326> Publish header files for flow
This commit is contained in:
A.J. Beamon 2017-07-14 15:55:01 -07:00 committed by GitHub Enterprise
parent 921dccbcad 660729839c
commit ed4fd4df50
12 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bindings/flow/local.mk
View File

@ -22,5 +22,23 @@
fdb_flow_CFLAGS := -Ibindings/c $(fdbrpc_CFLAGS)
fdb_flow_LDFLAGS := -Llib -lfdb_c $(fdbrpc_LDFLAGS)
fdb_flow_LIBS := lib/libfdbrpc.a
fdb_flow_LIBS :=
packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: fdb_flow
@echo "Packaging fdb_flow"
@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
@mkdir -p packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb
@cp lib/libfdb_flow.a packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
@find bindings/flow -name '*.h' -not -name 'bindings/flow/tester/*' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/flow \;
@find bindings/c/foundationdb -name '*.h' -exec cp {} packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/bindings/c/foundationdb \;
@tar czf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
@rm -rf packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
FDB_FLOW: packages/fdb-flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
FDB_FLOW_clean:
@echo "Cleaning fdb_flow package"
@rm -rf packages/fdb-flow-*.tar.gz
packages: FDB_FLOW
packages_clean: FDB_FLOW_clean

2
fdbclient/BackupAgent.h
View File

@ -25,7 +25,7 @@
#include "flow/flow.h"
#include "NativeAPI.h"
#include "TaskBucket.h"
#include "flow/Notified.h"
#include "Notified.h"
#include <fdbrpc/IAsyncFile.h>
#include "KeyBackedTypes.h"
#include <ctime>

4
flow/Notified.h → fdbclient/Notified.h
View File

@ -22,7 +22,7 @@
#define FLOW_NOTIFIED_H
#pragma once
#include "fdbclient/FDBTypes.h"
#include "FDBTypes.h"
#include "flow/TDMetric.actor.h"
struct NotifiedVersion {
@ -78,4 +78,4 @@ private:
VersionMetricHandle val;
};
#endif
#endif

2
fdbserver/ApplyMetadataMutation.h
View File

@ -25,10 +25,10 @@
#include "fdbclient/MutationList.h"
#include "fdbclient/SystemData.h"
#include "fdbclient/BackupAgent.h"
#include "fdbclient/Notified.h"
#include "IKeyValueStore.h"
#include "LogSystem.h"
#include "LogProtocolMessage.h"
#include "flow/Notified.h"
static bool isMetadataMutation(MutationRef const& m) {
// FIXME: This is conservative - not everything in system keyspace is necessarily processed by applyMetadataMutations

4
fdbserver/KeyValueStoreMemory.actor.cpp
View File

@ -22,8 +22,8 @@
#include "IKeyValueStore.h"
#include "IDiskQueue.h"
#include "flow/IndexedSet.h"
#include "flow/Notified.h"
#include "flow/ActorCollection.h"
#include "fdbclient/Notified.h"
#include "fdbclient/SystemData.h"
#define OP_DISK_OVERHEAD (sizeof(OpHeader) + 1)
@ -705,4 +705,4 @@ IKeyValueStore* keyValueStoreMemory( std::string const& basename, UID logID, int
IKeyValueStore* keyValueStoreLogSystem( class IDiskQueue* queue, UID logID, int64_t memoryLimit, bool disableSnapshot ) {
return new KeyValueStoreMemory( queue, logID, memoryLimit, disableSnapshot );
}
}

2
fdbserver/MasterProxyServer.actor.cpp
View File

@ -31,9 +31,9 @@
#include "LogSystemDiskQueueAdapter.h"
#include "IKeyValueStore.h"
#include "fdbclient/SystemData.h"
#include "flow/Notified.h"
#include "fdbrpc/sim_validation.h"
#include "fdbrpc/batcher.actor.h"
#include "fdbclient/Notified.h"
#include "fdbclient/KeyRangeMap.h"
#include "ConflictSet.h"
#include "flow/Stats.h"

4
fdbserver/OldTLogServer.actor.cpp
View File

@ -23,11 +23,11 @@
#include "flow/Stats.h"
#include "flow/UnitTest.h"
#include "fdbclient/NativeAPI.h"
#include "fdbclient/Notified.h"
#include "fdbclient/KeyRangeMap.h"
#include "fdbclient/SystemData.h"
#include "WorkerInterface.h"
#include "TLogInterface.h"
#include "flow/Notified.h"
#include "Knobs.h"
#include "IKeyValueStore.h"
#include "flow/ActorCollection.h"
@ -1448,4 +1448,4 @@ namespace oldTLog {
Void _ = wait( tLogStart( &self, LogSystemConfig(), Version(0), Version(0), std::vector<Tag>(), true, tli, ReplyPromise<TLogInterface>(), recoveryCount ) || removed );
throw internal_error(); // tLogStart doesn't return without an error
}
}
}

4
fdbserver/Orderer.actor.h
View File

@ -27,8 +27,8 @@
#elif !defined(FDBSERVER_ORDERER_ACTOR_H)
#define FDBSERVER_ORDERER_ACTOR_H
#include "fdbclient/Notified.h"
#include "flow/actorcompiler.h"
#include "flow/Notified.h"
template <class Seq>
class Orderer {
@ -71,4 +71,4 @@ private:
Promise<Void> shutdown; // Never set, only broken on destruction
};
#endif
#endif

2
fdbserver/TLogServer.actor.cpp
View File

@ -23,11 +23,11 @@
#include "flow/Stats.h"
#include "flow/UnitTest.h"
#include "fdbclient/NativeAPI.h"
#include "fdbclient/Notified.h"
#include "fdbclient/KeyRangeMap.h"
#include "fdbclient/SystemData.h"
#include "WorkerInterface.h"
#include "TLogInterface.h"
#include "flow/Notified.h"
#include "Knobs.h"
#include "IKeyValueStore.h"
#include "flow/ActorCollection.h"

2
fdbserver/masterserver.actor.cpp
View File

@ -24,9 +24,9 @@
#include "flow/Trace.h"
#include "fdbrpc/FailureMonitor.h"
#include "fdbclient/NativeAPI.h"
#include "fdbclient/Notified.h"
#include "fdbclient/SystemData.h"
#include "ConflictSet.h"
#include "flow/Notified.h"
#include "DataDistribution.h"
#include "Knobs.h"
#include <iterator>

2
fdbserver/storageserver.actor.cpp
View File

@ -29,12 +29,12 @@
#include "fdbclient/KeyRangeMap.h"
#include "fdbclient/SystemData.h"
#include "fdbclient/NativeAPI.h"
#include "fdbclient/Notified.h"
#include "fdbclient/MasterProxyInterface.h"
#include "fdbclient/DatabaseContext.h"
#include "WorkerInterface.h"
#include "TLogInterface.h"
#include "MoveKeys.h"
#include "flow/Notified.h"
#include "Knobs.h"
#include "WaitFailure.h"
#include "IKeyValueStore.h"

24
flow/local.mk
View File

@ -37,3 +37,27 @@ flow/hgVersion.h: FORCE
lib/libflow.a: bin/coverage.flow.xml
ifeq ($(RELEASE),true)
FLOWVER = $(VERSION)
else
FLOWVER = $(VERSION)-PRERELEASE
endif
packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz: flow
@echo "Packaging flow"
@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
@mkdir -p packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow
@cp lib/libflow.a packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/lib
@cp bin/actorcompiler.exe packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/bin
@find flow -name '*.h' -exec cp {} packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)/include/flow \;
@tar czf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz -C packages flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
@rm -rf packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH)
FLOW: packages/flow-$(FLOWVER)-$(PLATFORM)-$(ARCH).tar.gz
FLOW_clean:
@echo "Cleaning flow"
@rm -rf packages/flow-*.tar.gz
packages: FLOW
packages_clean: FLOW_clean