# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275923515 -3600
# Node ID f996f87645b0e61cda47872300571917aa304f27
# Parent  9ac0a0a7da70788fe4910dcfebe026e58ed61dc8
Add missing javacommons/jvms/j9 directory from earlier release and tweak buildstuff

diff -r 9ac0a0a7da70 -r f996f87645b0 build/Makefile.project
--- a/build/Makefile.project	Tue May 25 12:34:19 2010 +0300
+++ b/build/Makefile.project	Mon Jun 07 16:11:55 2010 +0100
@@ -58,7 +58,8 @@
     ifneq ($(wildcard $(addsuffix Series60v5.0.sis,$(S60_STUBSIS_DIRS))),)
       RD_JAVA_S60_RELEASE = 5.0
     else
-      $(error Cannot determine S60 release, no known stub files in $(S60_STUBSIS_DIRS))
+      # $(error Cannot determine S60 release, no known stub files in $(S60_STUBSIS_DIRS))
+      RD_JAVA_S60_RELEASE = 9.2
     endif
     endif
     endif
diff -r 9ac0a0a7da70 -r f996f87645b0 build/buildutils/generatej9zips.py
--- a/build/buildutils/generatej9zips.py	Tue May 25 12:34:19 2010 +0300
+++ b/build/buildutils/generatej9zips.py	Mon Jun 07 16:11:55 2010 +0100
@@ -26,7 +26,7 @@
         self.currentDestRoot = None
 
     def convert(self):
-        self.createPackages("weme")
+        # self.createPackages("weme")
         self.createPackages("wece")
         return
 
@@ -325,8 +325,8 @@
           ('winscw/udeb/z/resource/ive/lib/jclFoundation11/locale.zip', 'locale.fp.zip'),
           ('winscw/udeb/z/resource/ive/lib/jclCdc11/locale.zip', 'locale.cdc.zip'),
           ('../../../../../../info.txt', None),
-          ('../../../../copyright.txt', None),
-          ('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
+          ('../../../../../copyright.txt', None),
+          #('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
           ]
 
 j9FilesToIgnore = [
diff -r 9ac0a0a7da70 -r f996f87645b0 javacommons/jvms/j9/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/jvms/j9/bld.inf	Mon Jun 07 16:11:55 2010 +0100
@@ -0,0 +1,21 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Generated bld.inf -file
+*
+*/
+
+PRJ_PLATFORMS
+default
+
+#include "exports.inf" 
diff -r 9ac0a0a7da70 -r f996f87645b0 javacommons/jvms/j9/exports.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/jvms/j9/exports.inf	Mon Jun 07 16:11:55 2010 +0100
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+PRJ_PLATFORMS
+default
+
+#ifndef RD_JAVA_SF_BUILD
+#include "s60/exports.inf"
+#endif
diff -r 9ac0a0a7da70 -r f996f87645b0 javacommons/jvms/j9/j9.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/jvms/j9/j9.pro	Mon Jun 07 16:11:55 2010 +0100
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
+TEMPLATE = subdirs
+
+# Export J9 only when available here (not available here in SF builds)
+# (use indirection through ./exports.inf for pregenerated bld.inf variation)
+exists($${_PRO_FILE_PWD_}/s60/exports.inf): {
+  BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"exports.inf\"" \
+}