Skip to content
This repository has been archived by the owner on Jan 27, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:bitcomber/domus
Browse files Browse the repository at this point in the history
  • Loading branch information
George Sudarkoff committed Apr 18, 2012
2 parents 23e62f8 + 61ca93c commit f66487c
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 62 deletions.
2 changes: 1 addition & 1 deletion buildscripts/utils.py
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def getGitBranch():


def getGitBranchString( prefix="" , postfix="" ): def getGitBranchString( prefix="" , postfix="" ):
t = re.compile( '[/\\\]' ).split( os.getcwd() ) t = re.compile( '[/\\\]' ).split( os.getcwd() )
if len(t) > 2 and t[len(t)-1] == "mongo": if len(t) > 2 and t[len(t)-1] == "domus":
par = t[len(t)-2] par = t[len(t)-2]
m = re.compile( ".*_([vV]\d+\.\d+)$" ).match( par ) m = re.compile( ".*_([vV]\d+\.\d+)$" ).match( par )
if m is not None: if m is not None:
Expand Down
19 changes: 11 additions & 8 deletions header_cpp
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,11 +1,14 @@
// @file <filename.cpp> // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-


/** /**
* @file <filename.cpp>
* @brief <File description>
*
* Copyright (c) 2012 George Sudarkoff * Copyright (c) 2012 George Sudarkoff
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation * to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
Expand All @@ -15,14 +18,14 @@
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*
*/ */



#include "<filename.hpp>" #include "<filename.hpp>"
// The remaining headers go here // The remaining headers go here


Expand Down
19 changes: 12 additions & 7 deletions header_h
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,11 +1,14 @@
// @file <filename.hpp> // -*- mode:C++; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil -*-


/** /**
* @file <filename.hpp>
* @brief <File description>
*
* Copyright (c) 2012 George Sudarkoff * Copyright (c) 2012 George Sudarkoff
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation * to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
Expand All @@ -15,13 +18,15 @@
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*
*/ */


#pragma once
#ifndef DOMUS_<FILENAME>_HPP #ifndef DOMUS_<FILENAME>_HPP
#define DOMUS_<FILENAME>_HPP #define DOMUS_<FILENAME>_HPP


Expand Down
2 changes: 1 addition & 1 deletion src/domus/SConscript
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env.AlwaysBuild( env.Command( 'buildinfo.cpp', [], setupBuildInfoFile ) )


# --- SOURCE FILES --- # --- SOURCE FILES ---
serverOnlyFiles = [ "buildinfo.cpp", serverOnlyFiles = [ "buildinfo.cpp",
"domus.cpp" "domus.cpp",
] ]


serverOnlyFiles += env['DOMUS_COMMON_FILES'] serverOnlyFiles += env['DOMUS_COMMON_FILES']
Expand Down
48 changes: 25 additions & 23 deletions src/domus/domus.cpp
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,28 +1,30 @@
/** @file domus.cpp /**
@brief Defines main() for the domusd program. * @file domus.cpp
* @brief Defines main() for the domusd program.
Copyright (c) 2012 George Sudarkoff *
* Copyright (c) 2012 George Sudarkoff
Permission is hereby granted, free of charge, to any person obtaining a copy *
of this software and associated documentation files (the "Software"), to deal * Permission is hereby granted, free of charge, to any person obtaining a
in the Software without restriction, including without limitation the rights * copy of this software and associated documentation files (the "Software"),
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to deal in the Software without restriction, including without limitation
copies of the Software, and to permit persons to whom the Software is * the rights to use, copy, modify, merge, publish, distribute, sublicense,
furnished to do so, subject to the following conditions: * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in *
all copies or substantial portions of the Software. * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
SOFTWARE. * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/ */



#include "domus.hpp" #include "domus.hpp"


#include <iostream> #include <iostream>
Expand Down
46 changes: 24 additions & 22 deletions src/domus/domus.hpp
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,27 +1,29 @@
/** @file domus.hpp /**
* @file domus.hpp
Copyright (c) 2012 George Sudarkoff *
* Copyright (c) 2012 George Sudarkoff
Permission is hereby granted, free of charge, to any person obtaining a copy *
of this software and associated documentation files (the "Software"), to deal * Permission is hereby granted, free of charge, to any person obtaining a
in the Software without restriction, including without limitation the rights * copy of this software and associated documentation files (the "Software"),
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to deal in the Software without restriction, including without limitation
copies of the Software, and to permit persons to whom the Software is * the rights to use, copy, modify, merge, publish, distribute, sublicense,
furnished to do so, subject to the following conditions: * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in *
all copies or substantial portions of the Software. * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
SOFTWARE. * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/ */



#ifndef DOMUS_HPP #ifndef DOMUS_HPP
#define DOMUS_HPP #define DOMUS_HPP


Expand Down

0 comments on commit f66487c

Please sign in to comment.