CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/12/12 12:09:02
Modified files:
. : ChangeLog configure.ac
libbase : rc.cpp rc.h
server/asobj : System.cpp System.h
Log message:
* configure.ac: define DEFAULT_FLASH_PLATFORM_ID and
DEFAULT_FLASH_SYSTEM_OS based on $host (should likely
be based on $target or something similar, to check
when cross compiling)
* libbase/rc.{cpp,h}: add getFlashVersionString() and
getFlashSystemManufacturer() methods. Currently there's
no .gnashrc label for them, which are instead only initialized
based on values detected at configure time.
* server/asobj/System.{cpp,h}: delegate System.capabilities.os
and System.capabilities.manufacturer to RcInitFile.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5142&r2=1.5143
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.455&r2=1.456
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.h?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5142
retrieving revision 1.5143
diff -u -b -r1.5142 -r1.5143
--- ChangeLog 12 Dec 2007 11:07:43 -0000 1.5142
+++ ChangeLog 12 Dec 2007 12:09:01 -0000 1.5143
@@ -1,5 +1,18 @@
2007-12-12 Sandro Santilli <[EMAIL PROTECTED]>
+ * configure.ac: define DEFAULT_FLASH_PLATFORM_ID and
+ DEFAULT_FLASH_SYSTEM_OS based on $host (should likely
+ be based on $target or something similar, to check
+ when cross compiling)
+ * libbase/rc.{cpp,h}: add getFlashVersionString() and
+ getFlashSystemManufacturer() methods. Currently there's
+ no .gnashrc label for them, which are instead only initialized
+ based on values detected at configure time.
+ * server/asobj/System.{cpp,h}: delegate System.capabilities.os
+ and System.capabilities.manufacturer to RcInitFile.
+
+2007-12-12 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/libbase/Makefile.am: actually run the IntTypesTest.
2007-12-12 Zou Lunkai <[EMAIL PROTECTED]>
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- configure.ac 11 Dec 2007 03:23:01 -0000 1.455
+++ configure.ac 12 Dec 2007 12:09:01 -0000 1.456
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.455 2007/12/11 03:23:01 rsavoye Exp $
+dnl $Id: configure.ac,v 1.456 2007/12/12 12:09:01 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -44,6 +44,55 @@
AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["99"], [Default Flash revision number])
+dnl TODO: use host/build/target -- whatever is more appropriate
+case "${host}" in
+ *-apple-*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["MAC"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["MacOS"], [Default value for
System.capabilities.os])
+ ;;
+ *-openbsd*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OpenBSD"], [Default value for
System.capabilities.os])
+ ;;
+ *-freebsd*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["FreeBSD"], [Default value for
System.capabilities.os])
+ ;;
+ *-netbsd*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["BSD"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["NetBSD"], [Default value for
System.capabilities.os])
+ ;;
+ *-linux-gnu)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["GNU/Linux"], [Default value for
System.capabilities.os])
+ ;;
+ *-linux*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["LNX"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Linux"], [Default value for
System.capabilities.os])
+ ;;
+ *-cygwin* | *-mingw* | *-pw32*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["WIN"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Windows"], [Default value for
System.capabilities.os])
+ ;;
+ *-*solaris*
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SUN"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Solaris"], [Default value for
System.capabilities.os])
+ ;;
+ *-os2*
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["OS2"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["OS/2"], [Default value for
System.capabilities.os])
+ ;;
+ *-sco*)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["SCO"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["SCO/Unix"], [Default value for
System.capabilities.os])
+ ;;
+ *)
+ AC_DEFINE([DEFAULT_FLASH_PLATFORM_ID], ["UNK"], [Default 3-letter platform
identifier for version string])
+ AC_DEFINE([DEFAULT_FLASH_SYSTEM_OS], ["Unknown"], [Default value for
System.capabilities.os])
+ ;;
+esac
+
+
dnl Some things you can only do by looking at the platform name.
case "${host}" in
powerpc-apple-darwin*)
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- libbase/rc.cpp 4 Dec 2007 11:45:24 -0000 1.44
+++ libbase/rc.cpp 12 Dec 2007 12:09:02 -0000 1.45
@@ -63,10 +63,13 @@
_debug(false),
_debugger(false),
_verbosity(-1),
- _flashVersionString("GSH "\
+ _flashVersionString(
+ DEFAULT_FLASH_PLATFORM_ID" "\
DEFAULT_FLASH_MAJOR_VERSION","\
DEFAULT_FLASH_MINOR_VERSION","\
DEFAULT_FLASH_REV_NUMBER ",0"),
+ _flashSystemOS(DEFAULT_FLASH_SYSTEM_OS),
+ _flashSystemManufacturer("Gnash
"DEFAULT_FLASH_SYSTEM_OS),
_actiondump(false),
_parserdump(false),
_verboseASCodingErrors(false),
Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/rc.h 20 Oct 2007 07:05:16 -0000 1.32
+++ libbase/rc.h 12 Dec 2007 12:09:02 -0000 1.33
@@ -103,6 +103,10 @@
const std::string& getFlashVersionString() const { return
_flashVersionString; }
+ const std::string& getFlashSystemOS() const { return _flashSystemOS; }
+
+ const std::string& getFlashSystemManufacturer() const { return
_flashSystemManufacturer; }
+
int getRetries() const { return _retries; }
void setRetries(int x) { _retries = x; }
@@ -148,6 +152,8 @@
bool _debugger; // enable the Flash movie debugger
int _verbosity;
std::string _flashVersionString; //String to pass as $version in
Actionscript
+ std::string _flashSystemOS; //String to pass as
System.capabilities.os in Actionscript
+ std::string _flashSystemManufacturer; //String to pass as
System.capabilities.manufacturer in Actionscript
bool _actiondump; // enable dumping actionscript classes
bool _parserdump; // enable dumping parser data
Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/System.cpp 12 Dec 2007 04:31:05 -0000 1.16
+++ server/asobj/System.cpp 12 Dec 2007 12:09:02 -0000 1.17
@@ -30,45 +30,12 @@
namespace gnash {
-#if 0
-System::System() {
-}
-
-System::~System() {
-}
-
-
-void
-System::security_allowDomain()
-{
- log_unimpl (__PRETTY_FUNCTION__);
-}
-
-void
-System::security_allowInsecureDomain()
-{
- log_unimpl (__PRETTY_FUNCTION__);
-}
-
-void
-System::security_loadPolicyFile()
-{
- log_unimpl (__PRETTY_FUNCTION__);
-}
-
-void
-System::setClipboard()
-{
- log_unimpl (__PRETTY_FUNCTION__);
-}
-
-void
-System::showSettings()
-{
- log_unimpl (__PRETTY_FUNCTION__);
-}
-
-#endif
+static as_value system_security_allowdomain(const fn_call& fn);
+static as_value system_security_allowinsecuredomain(const fn_call& fn);
+static as_value system_security_loadpolicyfile(const fn_call& fn);
+static as_value system_setclipboard(const fn_call& fn);
+static as_value system_showsettings(const fn_call& fn);
+static as_value system_showsettings(const fn_call& fn);
static as_object*
getSystemSecurityInterface()
@@ -90,6 +57,8 @@
static as_object*
getSystemCapabilitiesInterface()
{
+ static RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+
static boost::intrusive_ptr<as_object> proto;
if ( proto == NULL )
{
@@ -107,10 +76,11 @@
// TODO:
// "Windows XP", "Windows 2000", "Windows NT", "Windows 98/ME",
"Windows 95", "Windows CE", "Linux", "MacOS"
- proto->init_member("os", "GNU", flags);
+ proto->init_member("os", rcfile.getFlashSystemOS(), flags);
// TODO: should be manufacturer and platform
- proto->init_member("manufacturer", "GNU Gnash", flags);
+ // "Macromedia Windows", "Macromedia Linux", "Macromedia MacOS"
+ proto->init_member("manufacturer",
rcfile.getFlashSystemManufacturer(), flags);
}
return proto.get();
}
@@ -133,7 +103,6 @@
{
proto = new as_object(getObjectInterface());
attachSystemInterface(*proto);
- //proto->init_member("constructor", new
builtin_function(system_new));
}
return proto.get();
}
@@ -144,14 +113,6 @@
{
}
-as_value
-system_new(const fn_call& /* fn */)
-{
- system_as_object *system_obj = new system_as_object();
-
- return as_value(system_obj);
-}
-
as_value system_security_allowdomain(const fn_call& /*fn*/) {
log_unimpl (__PRETTY_FUNCTION__);
return as_value();
Index: server/asobj/System.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/System.h 1 Jul 2007 10:54:31 -0000 1.10
+++ server/asobj/System.h 12 Dec 2007 12:09:02 -0000 1.11
@@ -31,65 +31,12 @@
namespace gnash {
-#if 0
-class System {
-public:
- System();
- ~System();
- void security_allowDomain();
- void security_allowInsecureDomain();
- void security_loadPolicyFile();
- void setClipboard();
- void showSettings();
-private:
- bool _capabilities;
- bool _object;
- bool _capabilities_avHardwareDisable;
- bool _capabilities_hasAccessibility;
- bool _capabilities_hasAudio;
- bool _capabilities_hasAudioEncoder;
- bool _capabilities_hasEmbeddedVideo;
- bool _capabilities_hasMP3;
- bool _capabilities_hasPrinting;
- bool _capabilities_hasScreenBroadcast;
- bool _capabilities_hasScreenPlayback;
- bool _capabilities_hasStreamingAudio;
- bool _capabilities_hasStreamingVideo;
- bool _capabilities_hasVideoEncoder;
- bool _capabilities_isDebugger;
- bool _capabilities_language;
- bool _capabilities_localFileReadDisable;
- bool _capabilities_manufacturer;
- bool _capabilities_os;
- bool _capabilities_pixelAspectRatio;
- bool _capabilities_playerType;
- bool _capabilities_screenColor;
- bool _capabilities_screenDPI;
- bool _capabilities_screenResolutionX;
- bool _capabilities_screenResolutionY;
- bool _capabilities_serverString;
- bool _capabilities_version;
- bool _security;
- bool _exactSettings;
- bool _onStatus;
- bool _useCodepage;
-};
-#endif
-
class system_as_object : public as_object
{
- //System obj;
public:
system_as_object();
};
-as_value system_new(const fn_call& fn);
-as_value system_security_allowdomain(const fn_call& fn);
-as_value system_security_allowinsecuredomain(const fn_call& fn);
-as_value system_security_loadpolicyfile(const fn_call& fn);
-as_value system_setclipboard(const fn_call& fn);
-as_value system_showsettings(const fn_call& fn);
-
void system_class_init(as_object& global);
} // end of gnash namespace
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
