Changeset 26612 for gs3-extensions

Show
Ignore:
Timestamp:
09.01.2013 11:38:16 (6 years ago)
Author:
davidb
Message:

Minor set of bug-fixes to files when testing out in Chris's account

Location:
gs3-extensions/i-greenstone-server/trunk/src
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/i-greenstone-server/trunk/src/CUSTOMIZATION.sh

    r26474 r26612  
    4646##cd ../.. 
    4747 
    48  
    4948echo  
    5049echo "***" 
    51 echo "* Now" 
    52 echo "*   cd i-jetty-3.1/i-jetty-ui" 
    53 echo "*   mvn clean install" 
    54 echo "* And run ./deploy.sh [id] to install and run on an Android device" 
     50echo "* Now run ./CUSTOMIZATION.sh" 
    5551echo "***" 
    5652echo 
  • gs3-extensions/i-greenstone-server/trunk/src/README.txt

    r26475 r26612  
    77  source ./devel.bash 
    88 
     9  Note: For now the easiest thing to do is to first of all edit  
     10  JAVA_HOME, ANDROID_SDK_HOME in this file and change to valid values  
     11  for your environment 
     12   
    913Then run in order: 
    1014 
     
    1216  ./RESET.sh  
    1317 
     18  ./CUSTOMIZATION.sh 
     19   
    1420  ./REBRAND.sh 
    1521 
    16   ./CUSTOMIZATION.sh 
    1722 
    1823 
     
    2328  followed by untarring the provided tarball. 
    2429 
     30  If you are behind a proxy, change the conf/settings.xml in maven folder: 
     31   
     32    <proxies> 
     33    <!-- proxy 
     34     | Specification for one proxy, to be used in connecting to the network. 
     35     | 
     36    <proxy> 
     37      <id>optional</id> 
     38      <active>true</active> 
     39      <protocol>http</protocol> 
     40      <username>proxyuser</username> 
     41      <password>proxypass</password> 
     42      <host>proxy.host.net</host> 
     43      <port>80</port> 
     44      <nonProxyHosts>local.net|some.host.com</nonProxyHosts> 
     45    </proxy> 
     46    --> 
     47  </proxies> 
     48   
     49  For CMS: 
     50  proxy.cms.waikato.ac.nz 
     51  port 3128 
    2552 
    2653 
     
    2855 
    2956 
    30  
  • gs3-extensions/i-greenstone-server/trunk/src/REBRAND.sh

    r26474 r26612  
    6464cd ../.. 
    6565 
     66 
    6667echo  
    6768echo "***" 
    68 echo "* Now run ./CUSTOMIZATION.sh" 
     69echo "* Now" 
     70echo "*   cd i-jetty-3.1/i-jetty-ui" 
     71echo "*   mvn clean install" 
     72echo "* And run ./deploy.sh [id] to install and run on an Android device" 
     73echo "*  'adb devices' will list all devices attached" 
    6974echo "***" 
    7075echo 
     76 
     77 
  • gs3-extensions/i-greenstone-server/trunk/src/devel.sh

    r26476 r26612  
    2323 
    2424if [ "x$JAVA_HOME" = "x" ] ; then 
    25   export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.6.0_35 
     25  export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.6.0_38 
    2626  export PATH=$JAVA_HOME/bin:$PATH 
    2727  echo "++ Set JAVA_HOME: $JAVA_HOME and added to PATH" 
     
    3030# Regular environment variable used to locate Android SDK 
    3131 
    32 export ANDROID_SDK_HOME=/cygdrive/c/Apps/Android/android-sdk/ 
    33 export PATH=$ANDROID_SDK_HOME/platform-toos:$PATH 
     32export ANDROID_SDK_HOME=/cygdrive/c/android/android-sdk-windows/ 
     33export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH 
    3434echo "++ set ANDROID_SDK_HOME: $ANDROID_SDK_HOME and updated PATH for platform-tools" 
    3535