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

Browse source
This commit is contained in:
Wouter den Breejen 2007-07-23 14:36:36 +00:00
parent 00f39f88f7
commit e3034da88b
8 changed files with 22 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/Makefile.am
View file

@ -10,6 +10,7 @@ pkginclude_HEADERS = \
worker-protocol.hh store-state.hh
libstore_la_LIBADD = ../libutil/libutil.la \
../libext3cow/libext3cow.la \
../boost/format/libformat.la
BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
@ -17,7 +18,7 @@ BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
EXTRA_DIST = derivations-ast.def derivations-ast.cc
AM_CXXFLAGS = -Wall \
-I$(srcdir)/.. ${bdb_include} ${aterm_include} -I$(srcdir)/../libutil -I$(srcdir)/../nix-state
-I$(srcdir)/.. ${bdb_include} ${aterm_include} -I$(srcdir)/../libutil -I$(srcdir)/../nix-state -I$(srcdir)/../libext3cow
derivations-ast.cc derivations-ast.hh: ../aterm-helper.pl derivations-ast.def
$(perl) $(srcdir)/../aterm-helper.pl derivations-ast.hh derivations-ast.cc < $(srcdir)/derivations-ast.def

18
src/libstore/store-state.cc
View file

@ -14,6 +14,7 @@
#include "local-store.hh"
#include "misc.hh"
#include "archive.hh"
#include "snapshot.hh"
namespace nix {
@ -29,9 +30,12 @@ void updatedStateDerivation(Path storePath)
void createStateDirs(const DerivationStateOutputDirs & stateOutputDirs, const DerivationStateOutputs & stateOutputs)
{
Path statePath = stateOutputs.find("state")->second.statepath;
string stateDir = statePath;
/*
string svnbin = nixSVNPath + "/svn";
string svnadminbin = nixSVNPath + "/svnadmin";
@ -89,6 +93,8 @@ void createStateDirs(const DerivationStateOutputDirs & stateOutputDirs, const De
//Initialize the counters for the statePaths that have an interval to 0
vector<int> empty;
store->setStatePathsInterval(intervalPaths, empty, true);
*/
}
void commitStatePathTxn(const Transaction & txn, const Path & statePath)
@ -223,6 +229,13 @@ void updateRevisionsRecursivelyTxn(const Transaction & txn, const Path & statePa
int readRevisionNumber(Path statePath)
{
string s = "/media/ext3cow/cca/";
const char* ss = s.c_str();
unsigned int i = take_snapshot(ss);
printMsg(lvlError, format("SS: '%1%'") % i);
////////
/*
string svnbin = nixSVNPath + "/svn";
RevisionNumbers revisions;
@ -243,8 +256,9 @@ int readRevisionNumber(Path statePath)
if(!succeed)
throw Error(format("Cannot read revision number of path '%1%'") % repos);
return revision;
return revision;
*/
return 0;
}
}