# HG changeset patch # User Eugene Ostroukhov # Date 1265390466 28800 # Node ID dcc7d466dfeea4f08970bb8e54e1514852569d94 # Parent 2196d1511a176a32bb6858e6dccda692d8ab81c5# Parent dfa87e0bcb2b2427eb7e48dcf81fa4109f24a6b7 Heads were merged diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.jseditors/icons/Thumbs.db Binary file org.symbian.tools.wrttools.jseditors/icons/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/icons/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/icons/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Landscape.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Landscape.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Portrait.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Portrait.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/device/240x320/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Landscape.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Landscape.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Portrait.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Portrait.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/device/320x240/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Landscape.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Landscape.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Portrait.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Portrait.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/800x352/Landscape.png Binary file org.symbian.tools.wrttools.previewer/preview/images/device/800x352/Landscape.png has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/800x352/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/device/800x352/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools.previewer/preview/images/device/Thumbs.db Binary file org.symbian.tools.wrttools.previewer/preview/images/device/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools/icons/Thumbs.db Binary file org.symbian.tools.wrttools/icons/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools/projecttemplates/WRTKit/Resources/Thumbs.db Binary file org.symbian.tools.wrttools/projecttemplates/WRTKit/Resources/Thumbs.db has changed diff -r 2196d1511a17 -r dcc7d466dfee org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java Fri Feb 05 09:19:20 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java Fri Feb 05 09:21:06 2010 -0800 @@ -30,7 +30,7 @@ @Override protected void addTemplateControls(Composite root) { - context.getExtensions().put("flickrUrl", "http://www.flickr.com/groups/symbianfoundation"); + context.getExtensions().put("flickrUrl", "http://flickr.com/photos/symbianfoundation"); createLabel(root, "Flickr URL:"); createTextForExt(root, "flickrUrl", "Flickr URL"); createLabel(root, ""); diff -r 2196d1511a17 -r dcc7d466dfee scripts/buildcron --- a/scripts/buildcron Fri Feb 05 09:19:20 2010 -0800 +++ b/scripts/buildcron Fri Feb 05 09:21:06 2010 -0800 @@ -1,5 +1,4 @@ # mail any output to ‘johnk’, no matter whose crontab this is MAILTO=johnk@symbian.org # run at 1 am -0 1 * * 0-5 /bin/sh /home/symbian/wrttools/scripts/shepard.sh > /home/symbian/scratch/build-`date +%j`.out 2>&1 - +0 1 * * 0-5 /bin/bash -c /home/symbian/wrttools/scripts/shepard.sh > /home/symbian/scratch/build$$.out 2>&1 diff -r 2196d1511a17 -r dcc7d466dfee scripts/shepard.sh --- a/scripts/shepard.sh Fri Feb 05 09:19:20 2010 -0800 +++ b/scripts/shepard.sh Fri Feb 05 09:21:06 2010 -0800 @@ -49,7 +49,7 @@ # package it up. cd ${LINUX_PROD_DIR} -tar -czvf webruntime.linux.tar eclipse +tar -czvf webruntime${DAY_OF_YEAR}.linux.tar eclipse # Mac OSX cp -pr ${MACOSX_EXPORT_DIR}/eclipse ${MACOSX_PROD_DIR} @@ -61,7 +61,7 @@ # package it up. cd ${MACOSX_PROD_DIR} -tar -czvf webruntime.macosx.tar eclipse +tar -czvf webruntime${DAY_OF_YEAR}.macosx.tar eclipse # Win32 cp -pr ${WIN32_EXPORT_DIR}/eclipse ${WIN32_PROD_DIR} @@ -74,5 +74,5 @@ # package it up. cd ${WIN32_PROD_DIR} -tar -czvf webruntime.win32.tar eclipse +tar -czvf webruntime${DAY_OF_YEAR}.win32.tar eclipse