nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 20:20:58 +01:00
Code Activity

Repositorys are created, state dirs are checked out automatically

Browse source
This commit is contained in:
Wouter den Breejen 2007-05-21 21:34:49 +00:00
parent 3fc0b0da58
commit 5cac336820
6 changed files with 11 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/Makefile.am
View file

@ -2,12 +2,12 @@ pkglib_LTLIBRARIES = libstore.la
libstore_la_SOURCES = \
store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \
globals.cc db.cc references.cc pathlocks.cc gc.cc
globals.cc db.cc references.cc pathlocks.cc gc.cc store-state.cc
pkginclude_HEADERS = \
store-api.hh local-store.hh remote-store.hh derivations.hh misc.hh \
globals.hh db.hh references.hh pathlocks.hh \
worker-protocol.hh
worker-protocol.hh store-state.hh
libstore_la_LIBADD = ../libutil/libutil.la \
../boost/format/libformat.la

3
src/libstore/build.cc
View file

@ -5,6 +5,8 @@
#include "local-store.hh"
#include "db.hh"
#include "util.hh"
#include "store-state.hh"
#include <map>
#include <iostream>
@ -1375,6 +1377,7 @@ void DerivationGoal::startBuilder()
tmpDir = createTempDir();
/* Create the state directory where the component can store it's state files place */
//TODO
stateDir = createStateDirs(drv.stateOutputDirs, drv.stateOutputs);
//TODO create the startupscript

7
src/libstore/derivations.hh
View file

@ -41,10 +41,11 @@ struct DerivationStateOutput
string enabled;
string shared;
string synchronization;
string createStateDirsBeforeInstall;
DerivationStateOutput()
{
}
DerivationStateOutput(Path statepath, string hashAlgo, string hash, string enabled, string shared, string synchronization)
DerivationStateOutput(Path statepath, string hashAlgo, string hash, string enabled, string shared, string synchronization, string createStateDirsBeforeInstall)
{
this->statepath = statepath;
this->hashAlgo = hashAlgo;
@ -52,6 +53,7 @@ struct DerivationStateOutput
this->enabled = enabled;
this->shared = shared;
this->synchronization = synchronization;
this->createStateDirsBeforeInstall = createStateDirsBeforeInstall;
}
};
@ -71,9 +73,6 @@ struct DerivationStateOutputDir
}
//sort function
/*bool operator<(const DerivationStateOutputDir& a, const DerivationStateOutputDir& b) {
return a.path < b.path;
} */
bool operator<(const DerivationStateOutputDir& a) const { return path < a.path; }
};