Links

Content Skeleton

This Page

Previous topic

Chiba Sources

Next topic

<no title>

CHIBACVS

Originates from translation of $HEPREZ_FOLDER/xforms/chiba-cvs/build.xml

CVS reminders..

Chiba Form tweaking workflow

  1. Modify .xsl:

    cd $(chibacvs-trunk)
    svn st
  2. chibacvs-deploy-web creates the war

  3. propagate into tomcat/chiba webapp:

    cd $(chibatomcat-dir) ; rm -rf 2 ; chibatomcat-unwar
  4. regenerate the forms:

    xsd2xhtml-;xsd2xhtml-build
  5. check resulting forms, rinse and repeat

Commit Patch to Chiba

To commit a change:

#. *chibacvs-makepatch*
#. *svn diff* on the patch to ensure is the desired change then commit the patch

Warning

Working copy modifications are reverted by chibacvs-build prior to patch application THE PATCH IS THE SOURCE

BUILD TESTING

chibacvs-build
chibatomcat-unwar-again
xsd2xhtml-build

THOUGHTS

Using the patch for whole file additions (see chibacvs-svnadd) is a misuse of patching as it makes it difficult to see changes to the patch due to the whole file additions

FUNCTIONS

chibacvs-dir
operating dir, all manipulations in here, eg /Users/heprez/data/install/chibacvs
chibacvs-cvsrootdir
target of the rsync
chibacvs-cvsrootsfo
sourceforge CVS repo coords, denies access
chibacvs-cvsroot
the root to use for the checkouts
chibacvs-stamp
timestamp
chibacvs-sandbox
sandbox
chibacvs-build
invokes -get -applypatch -deploy-core -deploy-web
chibacvs-rsync
rsync the complete chiba CVS repository into chibacvs-rootdir only needed when sourceforge CVS not working
chibacvs-get
[added 2013/03] As original sources no longer accessible, grab tarball from my cache http://dayabay.phys.ntu.edu.tw/cache/chiba-project-svn-trunk-2139.tar.gz and unpack into chibacvs-dir

chibacvs-applypatch

Contrary to expectations, no hunk problems:

b2mc:h heprez$ chibacvs-applypatch
=== chibacvs-applypatch : from /Users/heprez/data/install/chibacvs/chiba-project-svn-trunk-2139 revert and apply patch /Users/heprez/heprez/chiba/patch/chibacvs-2139-final-trunk.patch
patching file chiba-web/src/org/chiba/adapter/servlet/ChibaServlet.java
patching file chiba-web/etc/log4j.xml
patching file chiba-web/web/forms/styles/xforms.css
patching file chiba-web/web/forms/orderlist2.xhtml
patching file chiba-web/web/forms/xslt/html-form-controls-dist-scb-modified.xsl
patching file chiba-web/web/forms/xslt/html-form-controls.xsl
patching file chiba-web/web/forms/xslt/identity.xsl
patching file chiba-sandbox/src/org/chiba/tools/schemabuilder/AbstractSchemaFormBuilder.java
b2mc:h heprez$
chibacvs-final-makepatch

[added 2013/03] Final as have lost touch with SVN repo. If further changes are needed, should import to github or some such

Uses svn diff from chiba-finaltrunk to create a patch:

[blyth@cms01 chibacvs]$ chibacvs-finaltrunk
/data/heprez/install/chibacvs/trunk
[blyth@cms01 chibacvs]$ chibacvs-patchpath
/home/blyth/heprez/chiba/patch/chibacvs-2139-final-trunk.patch
chibacvs-compare-patched-trunks

[added 2013/06] Oops, rather different:

[blyth@cms01 trunk]$ l  /home/blyth/heprez/chiba/patch/
-rw-rw-r--  1 blyth blyth 619128 Jun 19 19:08 chibacvs-2139-final-trunk.patch
-rw-rw-r--  1 blyth blyth 313565 May  6  2009 chibacvs-2139.patch

Understanding diffs of diffs is painful, so apply the patches to relevant trunks and compare the different patched trunks.

chibacvs-co-deprecated

getting connection refused on attempting to login to chiba sourceforge CVS. Chiba has moved to SVN but failed to establish correspondence between my prior CVS checkout and the purported corresponding SVN tag

HMM, must control the revision in order to get the one that corresponds to patches try using SVN

chibacvs-rsync-to-hfag
workaround to transfer from cms01 to hfag while hfag does not have SSL capable SVN
chibacvs-deploy-core

deploy target from chiba-sandbox/build.xml creates:

chiba-sandbox/build
chiba-sandbox/chiba-1.2.0/*

On K, succeeds with two warnings regarding

this.model.getClass().getDeclaredMethod(name, null).invoke(this.model, null);

Logfile K:~/chibacvs-deploy-core.log

chibacvs-deploy-web

chiba-web/build.xml::install-from-local-core invokes the sibling chiba-sandbox/build.xml::deploy

chiba-web/build.xml::distribute creates source distribution files in tar.gz and zip format as well as a war-file for deployment in a webcontainer

creates:

chiba-web/build
chiba-web/chiba-web-2.0.0rc1
chiba-web/dist

historical comment: could go direct to deploying for speed, but preferable to go via the war for direct comparison with the normal build from the distribution

Logfile K:~/chibacvs-deploy-web.log

chibacvs-diff
comparisons of the checkouts done by chibacvs-co with the unmanaged morass on HFAG

Chiba Source Confusion

Due to the chiba sources moving around and now being inaccessible. Added chibacvs-get to grab from cache http://dayabay.phys.ntu.edu.tw/cache/chiba-project-svn-trunk-2139.tar.gz

Comparison on cms01

Compare this with the live sources on C (and later G) and check that the patches can be applied to it to reproduce the live versions.

Before running chibacvs-get:

[blyth@cms01 chibacvs]$ pwd
/data/heprez/install/chibacvs
[blyth@cms01 chibacvs]$ ll
total 32
drwxrwxr-x   6 blyth blyth 4096 Apr 30  2009 trunk
drwxrwxr-x   2 blyth blyth 4096 Apr 30  2009 deploy
drwxrwxr-x   4 blyth blyth 4096 Apr 30  2009 .

After:

[blyth@cms01 chibacvs]$ ll
total 11188
drwxrwxr-x   6 blyth blyth     4096 Apr 30  2009 trunk
drwxrwxr-x   2 blyth blyth     4096 Apr 30  2009 deploy
drwxrwxr-x  18 blyth blyth     4096 Apr 13  2012 ..
-rw-rw-r--   1 blyth blyth 11393150 Jun 19 18:58 chiba-project-svn-trunk-2139.tar.gz
drwxrwxr-x   5 blyth blyth     4096 Jun 19 18:58 .
drwxrwxr-x   5 blyth blyth     4096 Jun 19 18:58 chiba-project-svn-trunk-2139
[blyth@cms01 chibacvs]$
[blyth@cms01 chibacvs]$ diff -r --brief trunk chiba-project-svn-trunk-2139 | grep -v .svn
Only in trunk/chiba-sandbox: build
Only in trunk/chiba-sandbox: chiba-1.2.0
Only in trunk/chiba-web: build
Only in trunk/chiba-web: dist
Only in trunk/chiba-web: doc
Only in trunk/chiba-web/lib: core
Only in trunk/chiba-web/web/forms: orderlist2.xhtml
Only in trunk/chiba-web/web/forms/xslt: html-form-controls-dist-scb-modified.xsl
Only in trunk/chiba-web/web/forms/xslt: identity.xsl
[blyth@cms01 chibacvs]$

Source Archeology

Use trac to do some archeology to establish source correspondence...