Use clones of git repos for site building.
The svn interface to our repos on git is not behaving well. This is resulting in the website, examples, and api docs not being updated when they should (`svn up` is not doing what it should).
Instead of using svn checkouts, we should use clones of the git repos. At the same time, it makes sense to organize things a bit. These changes depend on a new structure on the openlayers.org machine:
/osgeo/openlayers/repos - clones of our openlayers, docs, and website repos
/osgeo/openlayers/sites - sources for openlayers.org, dev.openlayers.org, and docs.openlayers.org
Where things are "built" (e.g. minifying js and modifying example markup to point to that js), changes are now made outside of the repo cleans. Having dirty repos was another source of build failures.
Changes still need to be made to the release process/script.
This commit is contained in:
Tim Schaub
+30
-25
@@ -87,15 +87,20 @@ def parseHtml(html,ids):
|
|||||||
d['classes'] = classes
|
d['classes'] = classes
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def getSvnInfo(path):
|
def getGitInfo(exampleDir, exampleName):
|
||||||
h = os.popen("svn info %s --xml" % path)
|
orig = os.getcwd()
|
||||||
tree = ElementTree.fromstring(h.read())
|
os.chdir(exampleDir)
|
||||||
|
h = os.popen("git log -n 1 --pretty=format:'%an|%ai' " + exampleName)
|
||||||
|
os.chdir(orig)
|
||||||
|
log = h.read()
|
||||||
h.close()
|
h.close()
|
||||||
d = {
|
d = {}
|
||||||
'url': tree.findtext('entry/url'),
|
parts = log.split("|")
|
||||||
'author': tree.findtext('entry/commit/author'),
|
d["author"] = parts[0]
|
||||||
'date': tree.findtext('entry/commit/date')
|
# compensate for spaces in git log time
|
||||||
}
|
td = parts[1].split(" ")
|
||||||
|
td.insert(1, "T")
|
||||||
|
d["date"] = "".join(td)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def createFeed(examples):
|
def createFeed(examples):
|
||||||
@@ -190,34 +195,33 @@ if __name__ == "__main__":
|
|||||||
print "This script requires json or simplejson and BeautifulSoup. You don't have them. \n(%s)" % E
|
print "This script requires json or simplejson and BeautifulSoup. You don't have them. \n(%s)" % E
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
if len(sys.argv) > 1:
|
if len(sys.argv) == 3:
|
||||||
outFile = open(sys.argv[1],'w')
|
inExampleDir = sys.argv[1]
|
||||||
|
outExampleDir = sys.argv[2]
|
||||||
else:
|
else:
|
||||||
outFile = open('../examples/example-list.js','w')
|
inExampleDir = "../examples"
|
||||||
|
outExampleDir = "../examples"
|
||||||
|
|
||||||
examplesLocation = '../examples'
|
outFile = open(os.path.join(outExampleDir, "example-list.js"), "w")
|
||||||
print 'Reading examples from %s and writing out to %s' % (examplesLocation, outFile.name)
|
|
||||||
|
print 'Reading examples from %s and writing out to %s' % (inExampleDir, outFile.name)
|
||||||
|
|
||||||
exampleList = []
|
exampleList = []
|
||||||
docIds = ['title','shortdesc','tags']
|
docIds = ['title','shortdesc','tags']
|
||||||
|
|
||||||
#comment out option to create docs from online resource
|
examples = getListOfExamples(inExampleDir)
|
||||||
#examplesLocation = 'http://svn.openlayers.org/sandbox/docs/examples/'
|
|
||||||
#examples = getListOfOnlineExamples(examplesLocation)
|
|
||||||
|
|
||||||
examples = getListOfExamples(examplesLocation)
|
|
||||||
|
|
||||||
modtime = time.strftime("%Y-%m-%dT%I:%M:%SZ", time.gmtime())
|
modtime = time.strftime("%Y-%m-%dT%I:%M:%SZ", time.gmtime())
|
||||||
|
|
||||||
for example in examples:
|
for example in examples:
|
||||||
url = os.path.join(examplesLocation,example)
|
path = os.path.join(inExampleDir, example)
|
||||||
html = getExampleHtml(url)
|
html = getExampleHtml(path)
|
||||||
tagvalues = parseHtml(html,docIds)
|
tagvalues = parseHtml(html,docIds)
|
||||||
tagvalues['example'] = example
|
tagvalues['example'] = example
|
||||||
# add in svn info
|
# add in author/date info
|
||||||
d = getSvnInfo(url)
|
d = getGitInfo(inExampleDir, example)
|
||||||
tagvalues["modified"] = d["date"] or modtime
|
|
||||||
tagvalues["author"] = d["author"] or "anonymous"
|
tagvalues["author"] = d["author"] or "anonymous"
|
||||||
|
tagvalues["modified"] = d["date"] or modtime
|
||||||
tagvalues['link'] = example
|
tagvalues['link'] = example
|
||||||
|
|
||||||
exampleList.append(tagvalues)
|
exampleList.append(tagvalues)
|
||||||
@@ -234,8 +238,9 @@ if __name__ == "__main__":
|
|||||||
outFile.write(json)
|
outFile.write(json)
|
||||||
outFile.close()
|
outFile.close()
|
||||||
|
|
||||||
print "writing feed to ../examples/%s " % feedName
|
outFeedPath = os.path.join(outExampleDir, feedName);
|
||||||
atom = open('../examples/%s' % feedName, 'w')
|
print "writing feed to %s " % outFeedPath
|
||||||
|
atom = open(outFeedPath, 'w')
|
||||||
doc = createFeed(exampleList)
|
doc = createFeed(exampleList)
|
||||||
atom.write(doc.toxml())
|
atom.write(doc.toxml())
|
||||||
atom.close()
|
atom.close()
|
||||||
|
|||||||
+91
-44
@@ -1,65 +1,112 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Used to update http://openlayers.org/dev/
|
# check to see if the hosted examples or API docs need an update
|
||||||
|
cd /osgeo/openlayers/repos/openlayers
|
||||||
|
REMOTE_HEAD=`git ls-remote https://github.com/openlayers/openlayers/ | grep HEAD | awk '{print $1}'`
|
||||||
|
OLD_REMOTE_HEAD=`git rev-parse HEAD`
|
||||||
|
|
||||||
|
# if there's something different in the remote, update and build
|
||||||
|
if [ ! o$REMOTE_HEAD = o$OLD_REMOTE_HEAD ]; then
|
||||||
|
|
||||||
# Get current 'Last Changed Rev'
|
git checkout master
|
||||||
GITREV=`git ls-remote https://github.com/openlayers/openlayers/ | grep HEAD | awk '{print $1}'`
|
git clean -f
|
||||||
SVNREV=`svn info http://svn.openlayers.org/ | grep 'Revision' | awk '{print $2}'`
|
git pull origin master
|
||||||
|
|
||||||
# Get the last svn rev
|
# copy everything over to the dev dir within the website (keep the clone clean)
|
||||||
touch /tmp/ol_git_rev
|
rsync -r --exclude=.git . /osgeo/openlayers/sites/openlayers.org/dev
|
||||||
touch /tmp/ol_svn_rev
|
|
||||||
OLD_GITREV="o`cat /tmp/ol_git_rev`"
|
|
||||||
OLD_SVNREV="o`cat /tmp/ol_svn_rev`"
|
|
||||||
|
|
||||||
# If they're not equal, do some work.
|
# make examples use built lib
|
||||||
if [ ! o$GITREV = $OLD_GITREV ]; then
|
cd /osgeo/openlayers/sites/openlayers.org/dev/tools
|
||||||
svn revert -R /osgeo/openlayers/docs/dev
|
|
||||||
svn up /osgeo/openlayers/docs/dev
|
|
||||||
|
|
||||||
# Also update website
|
python exampleparser.py /osgeo/openlayers/repos/openlayers/examples /osgeo/openlayers/sites/openlayers.org/dev/examples
|
||||||
svn up /osgeo/openlayers/docs/
|
|
||||||
|
|
||||||
cd /osgeo/openlayers/docs/dev/tools/
|
if [ ! -f closure-compiler.jar ]; then
|
||||||
python exampleparser.py
|
wget -c http://closure-compiler.googlecode.com/files/compiler-latest.zip
|
||||||
cd /osgeo/openlayers/docs/dev/build
|
unzip compiler-latest.zip
|
||||||
|
mv compiler.jar closure-compiler.jar
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd /osgeo/openlayers/sites/openlayers.org/dev/build
|
||||||
./build.py -c closure tests.cfg
|
./build.py -c closure tests.cfg
|
||||||
./build.py -c closure mobile.cfg OpenLayers.mobile.js
|
./build.py -c closure mobile.cfg OpenLayers.mobile.js
|
||||||
./build.py -c closure light.cfg OpenLayers.light.js
|
./build.py -c closure light.cfg OpenLayers.light.js
|
||||||
./build.py -c none tests.cfg OpenLayers.debug.js
|
./build.py -c none tests.cfg OpenLayers.debug.js
|
||||||
./build.py -c none mobile.cfg OpenLayers.mobile.debug.js
|
./build.py -c none mobile.cfg OpenLayers.mobile.debug.js
|
||||||
./build.py -c none light.cfg OpenLayers.light.debug.js
|
./build.py -c none light.cfg OpenLayers.light.debug.js
|
||||||
|
cp OpenLayers*.js ..
|
||||||
cp OpenLayers.js ..
|
|
||||||
cp OpenLayers.*.js ..
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
|
cd /osgeo/openlayers/sites/openlayers.org/dev
|
||||||
sed -i -e 's!../lib/OpenLayers.js?mobile!../OpenLayers.mobile.js!' examples/*.html
|
sed -i -e 's!../lib/OpenLayers.js?mobile!../OpenLayers.mobile.js!' examples/*.html
|
||||||
sed -i -e 's!../lib/OpenLayers.js!../OpenLayers.js!' examples/*.html
|
sed -i -e 's!../lib/OpenLayers.js!../OpenLayers.js!' examples/*.html
|
||||||
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/apidocs -p /osgeo/openlayers/docs/dev/apidoc_config -s Default OL >/dev/null
|
|
||||||
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/docs -p /osgeo/openlayers/docs/dev/doc_config -s Default OL >/dev/null
|
# update the API docs
|
||||||
# Record the revision
|
if [ ! -d /osgeo/openlayers/sites/dev.openlayers.org/apidocs ]; then
|
||||||
echo -n $GITREV > /tmp/ol_git_rev
|
mkdir -p /osgeo/openlayers/sites/dev.openlayers.org/apidocs
|
||||||
|
fi
|
||||||
|
if [ ! -d /osgeo/openlayers/sites/dev.openlayers.org/docs ]; then
|
||||||
|
mkdir -p /osgeo/openlayers/sites/dev.openlayers.org/docs
|
||||||
|
fi
|
||||||
|
naturaldocs --input lib --output HTML /osgeo/openlayers/sites/dev.openlayers.org/apidocs -p apidoc_config -s Default OL
|
||||||
|
naturaldocs --input lib --output HTML /osgeo/openlayers/sites/dev.openlayers.org/docs -p doc_config -s Default OL
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# check to see if the website needs an update
|
||||||
|
cd /osgeo/openlayers/repos/website
|
||||||
|
REMOTE_HEAD=`git ls-remote https://github.com/openlayers/website/ | grep HEAD | awk '{print $1}'`
|
||||||
|
OLD_REMOTE_HEAD=`git rev-parse HEAD`
|
||||||
|
|
||||||
|
# if there's something different in the remote, update the clone
|
||||||
|
if [ ! o$REMOTE_HEAD = o$OLD_REMOTE_HEAD ]; then
|
||||||
|
|
||||||
|
git checkout master
|
||||||
|
git clean -f
|
||||||
|
git pull origin master
|
||||||
|
|
||||||
|
# copy everything over to the website dir (keep the clone clean)
|
||||||
|
# can't use --delete here because of nested dev dir from above
|
||||||
|
rsync -r --exclude=.git . /osgeo/openlayers/sites/openlayers.org
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
# check to see if prose docs need an update
|
||||||
|
cd /osgeo/openlayers/repos/docs
|
||||||
|
REMOTE_HEAD=`git ls-remote https://github.com/openlayers/docs/ | grep HEAD | awk '{print $1}'`
|
||||||
|
OLD_REMOTE_HEAD=`git rev-parse HEAD`
|
||||||
|
|
||||||
|
# if there's something different in the remote, update the clone
|
||||||
|
if [ ! o$REMOTE_HEAD = o$OLD_REMOTE_HEAD ]; then
|
||||||
|
|
||||||
|
git checkout master
|
||||||
|
git clean -f
|
||||||
|
git pull origin master
|
||||||
|
|
||||||
|
mkdir -p /tmp/ol/docs/build/html /tmp/ol/docs/build/doctrees
|
||||||
|
sphinx-build -b html -d /tmp/ol/docs/build/doctrees . /tmp/ol/docs/build/html
|
||||||
|
|
||||||
|
rsync -r --delete /tmp/ol/docs/build/html/ /osgeo/openlayers/sites/docs.openlayers.org
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
## UPDATES FROM THE OLD SVN REPO
|
||||||
|
|
||||||
|
# Get current 'Last Changed Rev'
|
||||||
|
SVNREV=`svn info http://svn.openlayers.org/ | grep 'Revision' | awk '{print $2}'`
|
||||||
|
|
||||||
|
# Get the last svn rev
|
||||||
|
touch /tmp/ol_svn_rev
|
||||||
|
OLD_SVNREV="o`cat /tmp/ol_svn_rev`"
|
||||||
|
|
||||||
|
# If they're not equal, do some work.
|
||||||
if [ ! o$SVNREV = $OLD_SVNREV ]; then
|
if [ ! o$SVNREV = $OLD_SVNREV ]; then
|
||||||
svn up /osgeo/openlayers/dev/sandbox/
|
svn up /osgeo/openlayers/repos/old_svn_repo/
|
||||||
svn up /osgeo/openlayers/dev/addins/
|
|
||||||
# Record the revision
|
# Record the revision
|
||||||
echo -n $SVNREV > /tmp/ol_svn_rev
|
echo -n $SVNREV > /tmp/ol_svn_rev
|
||||||
fi
|
|
||||||
|
|
||||||
svn up /osgeo/openlayers/documentation-checkout
|
# update the hosted sandboxes
|
||||||
REV=`svn info /osgeo/openlayers/documentation-checkout | grep 'Last Changed Rev' | awk '{print $4}'`
|
rsync -r --delete --exclude=.svn --delete-excluded /osgeo/openlayers/repos/old_svn_repo/sandbox /osgeo/openlayers/sites/dev.openlayers.org/
|
||||||
# Get the last svn rev
|
|
||||||
touch /tmp/ol_doc_rev
|
# update the hosted addins
|
||||||
OLD_REV="o`cat /tmp/ol_doc_rev`"
|
rsync -r --delete --exclude=.svn --delete-excluded /osgeo/openlayers/repos/old_svn_repo/addins /osgeo/openlayers/sites/dev.openlayers.org/
|
||||||
# If they're not equal, do some work.
|
|
||||||
if [ ! o$REV = $OLD_REV ]; then
|
|
||||||
cd /osgeo/openlayers/documentation-checkout
|
|
||||||
make html > /dev/null
|
|
||||||
cp -r _build/html/* /osgeo/openlayers/documentation
|
|
||||||
|
|
||||||
echo -n $REV > /tmp/ol_doc_rev
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user