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

Commit

Permalink
Merge pull request #597 from rhyolight/core-submodule
Browse files Browse the repository at this point in the history
Core submodule
  • Loading branch information
scottpurdy committed Feb 4, 2014
2 parents 56d4bbc + 7ae2731 commit 5dd1cbf
Show file tree
Hide file tree
Showing 262 changed files with 28 additions and 109,079 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "nupic.core"]
path = nta
url = git://github.com/numenta/nupic.core.git
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ language: python
python:
- "2.6"
- "2.7"

git:
submodules: false

env:
global:
- NUPIC=$TRAVIS_BUILD_DIR
Expand Down
20 changes: 20 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@ function doMake {
exitOnError $?
}

function cleanUpCoreSubmodule {
# Someone might have removed the submodule directory, so let's put it back
# before running any submodule commands.
if [[ ! -d $NUPIC/nta ]] ; then
mkdir $NUPIC/nta
fi
pushd $NUPIC
git submodule foreach git clean -fd
popd
}

function syncCoreSubmodule {
cleanUpCoreSubmodule
pushd $NUPIC
git submodule update --init
popd
}

function cleanUpDirectories {
popd
[[ -d $BUILDDIR ]] && echo "Warning: directory \"$BUILDDIR\" already exists and may contain (old) data. Consider removing it. "
Expand All @@ -89,6 +107,7 @@ function cleanUpEnv {
# Redirect stdout to a file but still print stderr.
mkdir -p `dirname $STDOUT`
{
syncCoreSubmodule
prepDirectories

pythonSetup
Expand All @@ -97,6 +116,7 @@ mkdir -p `dirname $STDOUT`

cleanUpDirectories
cleanUpEnv
cleanUpCoreSubmodule
} 2>&1 > $STDOUT

echo
Expand Down
1 change: 1 addition & 0 deletions nta
Submodule nta added at d8e805
11 changes: 0 additions & 11 deletions nta/Makefile.ami

This file was deleted.

28 changes: 0 additions & 28 deletions nta/README_NTA.txt

This file was deleted.

150 changes: 0 additions & 150 deletions nta/algorithms/Cell.cpp

This file was deleted.

Loading

0 comments on commit 5dd1cbf

Please sign in to comment.