Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2:Test
mysql-gui-tools
mysql-gui-tools-path-changes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mysql-gui-tools-path-changes.patch of Package mysql-gui-tools
diff -Naru mysql-gui-tools-5.0r14-bak/administrator/configure.in mysql-gui-tools-5.0r14/administrator/configure.in --- mysql-gui-tools-5.0r14-bak/administrator/configure.in 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/configure.in 2008-12-19 11:26:17.000000000 +0100 @@ -19,10 +19,10 @@ # # internal libraries # -AC_CHECK_FILE(../mysql-gui-common/library/base-library, [], +AC_CHECK_FILE(../common/library/base-library, [], AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program])) -#AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [], +#AC_CHECK_FILE(../common/source/linux/libmacommongui.a, [], # AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program])) diff -Naru mysql-gui-tools-5.0r14-bak/administrator/extract_pot.sh mysql-gui-tools-5.0r14/administrator/extract_pot.sh --- mysql-gui-tools-5.0r14-bak/administrator/extract_pot.sh 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/extract_pot.sh 2008-12-19 11:26:17.000000000 +0100 @@ -2,7 +2,7 @@ FILES="glade_files.c source/linux/*c library/source/*c" -python ../mysql-gui-common/tools/po_glade.py res/linux/*.glade > glade_files.c +python ../common/tools/po_glade.py res/linux/*.glade > glade_files.c xgettext --default-domain=mysql-administrator\ --add-comments --keyword=_ --keyword=N_ $FILES \ diff -Naru mysql-gui-tools-5.0r14-bak/administrator/library/source/Makefile.am mysql-gui-tools-5.0r14/administrator/library/source/Makefile.am --- mysql-gui-tools-5.0r14-bak/administrator/library/source/Makefile.am 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/library/source/Makefile.am 2008-12-19 11:26:16.000000000 +0100 @@ -3,10 +3,10 @@ INCLUDES= -Wsign-compare -Wall \ -I../include @MYSQL_CFLAGS@ \ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/base-library/include\ + -I$(top_srcdir)/../common/library/utilities/shared_include\ + -I$(top_srcdir)/../common/library/utilities/include\ @PCRE_CFLAGS@\ @GLIB_CFLAGS@ diff -Naru mysql-gui-tools-5.0r14-bak/administrator/mysql-administrator.spec.in mysql-gui-tools-5.0r14/administrator/mysql-administrator.spec.in --- mysql-gui-tools-5.0r14-bak/administrator/mysql-administrator.spec.in 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/mysql-administrator.spec.in 2008-12-19 11:26:04.000000000 +0100 @@ -31,7 +31,7 @@ %build # first we have to build the common libs -cd ../mysql-gui-common +cd ../common %configure --with-commondirname=administrator make %{?_smp_mflags} @@ -43,7 +43,7 @@ %install rm -rf %{buildroot} -cd ../mysql-gui-common +cd ../common make DESTDIR=%{buildroot} install cd ../%{name} diff -Naru mysql-gui-tools-5.0r14-bak/administrator/po/Makefile.in.in mysql-gui-tools-5.0r14/administrator/po/Makefile.in.in --- mysql-gui-tools-5.0r14-bak/administrator/po/Makefile.in.in 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/po/Makefile.in.in 2008-12-19 11:26:17.000000000 +0100 @@ -81,7 +81,7 @@ # $(MSGFMT) -o $@ $< .po.mo: - msgcat -o $<-merged $< $(top_srcdir)/../mysql-gui-common/po/mysql-gui-common-template.po + msgcat -o $<-merged $< $(top_srcdir)/../common/po/mysql-gui-common-template.po $(MSGFMT) -o $@ $<-merged #.po.gmo: @@ -90,7 +90,7 @@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && msgcat -o $<-merged $< $(top_srcdir)/../mysql-gui-common/po/mysql-gui-common-template.po\ + && msgcat -o $<-merged $< $(top_srcdir)/../common/po/mysql-gui-common-template.po\ && rm -f $$file && $(GMSGFMT) -o $$file $<-merged diff -Naru mysql-gui-tools-5.0r14-bak/administrator/po/update.sh mysql-gui-tools-5.0r14/administrator/po/update.sh --- mysql-gui-tools-5.0r14-bak/administrator/po/update.sh 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/po/update.sh 2008-12-19 11:26:17.000000000 +0100 @@ -5,7 +5,7 @@ tr -d \\r < $template > tmp mv tmp $template -python ../../mysql-gui-common/tools/glade2po.py ../res/linux/*.glade --except-from=$template > glade.pot +python ../../common/tools/glade2po.py ../res/linux/*.glade --except-from=$template > glade.pot msgcat -s -o new.pot glade.pot $template mv -f new.pot $template pofiles=`/bin/ls -1 *.po|grep -v template` diff -Naru mysql-gui-tools-5.0r14-bak/administrator/setup/windows/source/mysql_administrator.xml mysql-gui-tools-5.0r14/administrator/setup/windows/source/mysql_administrator.xml --- mysql-gui-tools-5.0r14-bak/administrator/setup/windows/source/mysql_administrator.xml 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/setup/windows/source/mysql_administrator.xml 2008-12-19 11:26:17.000000000 +0100 @@ -109,7 +109,7 @@ Include UI --> - <?include ../../../mysql-gui-common/setup/windows/mysql_common_ui.inc ?> + <?include ../../../common/setup/windows/mysql_common_ui.inc ?> <!-- ***************************************************************************************** Properties @@ -192,22 +192,22 @@ <Binary Id="AdminBackground" src="resources/AdminBackground.jpg" /> <Binary Id="AdminHeader" src="resources/AdminHeader.jpg" /> - <Binary Id="NewBinary2" src="../../../mysql-gui-common/setup/windows/resources/binary/binary2" /> - <Binary Id="NewBinary3" src="../../../mysql-gui-common/setup/windows/resources/binary/binary3" /> - <Binary Id="NewBinary4" src="../../../mysql-gui-common/setup/windows/resources/binary/binary4" /> - <Binary Id="NewBinary5" src="../../../mysql-gui-common/setup/windows/resources/binary/binary5" /> - <Binary Id="NewBinary6" src="../../../mysql-gui-common/setup/windows/resources/binary/binary6" /> - <Binary Id="NewBinary7" src="../../../mysql-gui-common/setup/windows/resources/binary/binary7" /> - <Binary Id="NewBinary8" src="../../../mysql-gui-common/setup/windows/resources/binary/binary8" /> - <Binary Id="NewBinary9" src="../../../mysql-gui-common/setup/windows/resources/binary/binary9" /> - <Binary Id="NewBinary10" src="../../../mysql-gui-common/setup/windows/resources/binary/binary10" /> - <Binary Id="NewBinary11" src="../../../mysql-gui-common/setup/windows/resources/binary/binary11" /> - <Binary Id="NewBinary12" src="../../../mysql-gui-common/setup/windows/resources/binary/binary12" /> - <Binary Id="NewBinary13" src="../../../mysql-gui-common/setup/windows/resources/binary/binary13" /> - <Binary Id="NewBinary14" src="../../../mysql-gui-common/setup/windows/resources/binary/binary14" /> - <Binary Id="NewBinary15" src="../../../mysql-gui-common/setup/windows/resources/binary/binary15" /> - <Binary Id="NewBinary16" src="../../../mysql-gui-common/setup/windows/resources/binary/binary16" /> - <Binary Id="NewBinary17" src="../../../mysql-gui-common/setup/windows/resources/binary/binary17" /> - <Binary Id="NewBinary18" src="../../../mysql-gui-common/setup/windows/resources/binary/binary18" /> + <Binary Id="NewBinary2" src="../../../common/setup/windows/resources/binary/binary2" /> + <Binary Id="NewBinary3" src="../../../common/setup/windows/resources/binary/binary3" /> + <Binary Id="NewBinary4" src="../../../common/setup/windows/resources/binary/binary4" /> + <Binary Id="NewBinary5" src="../../../common/setup/windows/resources/binary/binary5" /> + <Binary Id="NewBinary6" src="../../../common/setup/windows/resources/binary/binary6" /> + <Binary Id="NewBinary7" src="../../../common/setup/windows/resources/binary/binary7" /> + <Binary Id="NewBinary8" src="../../../common/setup/windows/resources/binary/binary8" /> + <Binary Id="NewBinary9" src="../../../common/setup/windows/resources/binary/binary9" /> + <Binary Id="NewBinary10" src="../../../common/setup/windows/resources/binary/binary10" /> + <Binary Id="NewBinary11" src="../../../common/setup/windows/resources/binary/binary11" /> + <Binary Id="NewBinary12" src="../../../common/setup/windows/resources/binary/binary12" /> + <Binary Id="NewBinary13" src="../../../common/setup/windows/resources/binary/binary13" /> + <Binary Id="NewBinary14" src="../../../common/setup/windows/resources/binary/binary14" /> + <Binary Id="NewBinary15" src="../../../common/setup/windows/resources/binary/binary15" /> + <Binary Id="NewBinary16" src="../../../common/setup/windows/resources/binary/binary16" /> + <Binary Id="NewBinary17" src="../../../common/setup/windows/resources/binary/binary17" /> + <Binary Id="NewBinary18" src="../../../common/setup/windows/resources/binary/binary18" /> </Product> </Wix> diff -Naru mysql-gui-tools-5.0r14-bak/administrator/source/linux/Makefile.am mysql-gui-tools-5.0r14/administrator/source/linux/Makefile.am --- mysql-gui-tools-5.0r14-bak/administrator/source/linux/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/source/linux/Makefile.am 2008-12-19 11:26:11.000000000 +0100 @@ -31,10 +31,10 @@ INCLUDES=@GNOME_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/base-library/include\ + -I$(top_srcdir)/../common/library/utilities/shared_include\ + -I$(top_srcdir)/../common/library/utilities/include\ -I$(top_srcdir)/library/include\ -DPREFIX=\""$(PREFIX)"\"\ -DDATADIRNAME=\""$(DATADIRNAME)"\"\ @@ -46,9 +46,9 @@ mysql_administrator_bin_LDADD=\ $(top_srcdir)/library/source/libadmin.a\ - $(top_srcdir)/../mysql-gui-common/source/linux/libmacommongui.a\ - $(top_srcdir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\ - $(top_srcdir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\ - $(top_srcdir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\ + $(top_srcdir)/../common/source/linux/libmacommongui.a\ + $(top_srcdir)/../common/library/base-library/source/.libs/libmysqlx.a\ + $(top_srcdir)/../common/library/sql-parser/source/.libs/libsqlparser.a\ + $(top_srcdir)/../common/library/utilities/source/.libs/libguiutil.a\ @MYSQL_LIBS@ @GNOME_LIBS@ @UTIL_LIBS@ @PCRE_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj mysql-gui-tools-5.0r14/administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj --- mysql-gui-tools-5.0r14-bak/administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj 2008-12-18 17:48:17.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj 2008-12-19 11:26:15.000000000 +0100 @@ -356,7 +356,7 @@ 6535B3BD06B070EA000445A4 /* MAHealthGraph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAHealthGraph.m; sourceTree = SOURCE_ROOT; }; 6535B58A06B2041C000445A4 /* mysqladmin_health.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = mysqladmin_health.xml; sourceTree = "<group>"; }; 6535B75206B30536000445A4 /* health_level_fg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = health_level_fg.png; sourceTree = "<group>"; }; - 65369E580693704100DFB427 /* user_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = user_icon.png; path = "../../../mysql-gui-common/images/icons/png/user_icon.png"; sourceTree = SOURCE_ROOT; }; + 65369E580693704100DFB427 /* user_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = user_icon.png; path = "../../../common/images/icons/png/user_icon.png"; sourceTree = SOURCE_ROOT; }; 6543AAA306911A01002E79CA /* MACatalogs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MACatalogs.h; sourceTree = "<group>"; }; 6543AAA406911A01002E79CA /* MACatalogs.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = MACatalogs.m; sourceTree = "<group>"; }; 6562F71606B4D410001AED88 /* mysqladmin_status_variables.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = mysqladmin_status_variables.xml; sourceTree = "<group>"; }; @@ -1655,7 +1655,7 @@ PREBINDING = NO; PRODUCT_NAME = mabackup; SYMROOT = "~/guibuild"; - USER_HEADER_SEARCH_PATHS = "$(SOURCE_ROOT)/../../../mysql-gui-common/library/base-library/include $(SOURCE_ROOT)/../../../mysql-gui-common/library/utilities/shared_include $(SOURCE_ROOT)/../../../mysql-gui-common/library/utilities/include"; + USER_HEADER_SEARCH_PATHS = "$(SOURCE_ROOT)/../../../common/library/base-library/include $(SOURCE_ROOT)/../../../common/library/utilities/shared_include $(SOURCE_ROOT)/../../../common/library/utilities/include"; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", diff -Naru mysql-gui-tools-5.0r14-bak/administrator/source/util/Makefile.am mysql-gui-tools-5.0r14/administrator/source/util/Makefile.am --- mysql-gui-tools-5.0r14-bak/administrator/source/util/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/source/util/Makefile.am 2008-12-19 11:26:11.000000000 +0100 @@ -5,9 +5,9 @@ INCLUDES=@GLIB_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\ - -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/../common/library/base-library/include\ + -I$(top_srcdir)/../common/library/utilities/shared_include\ + -I$(top_srcdir)/../common/library/utilities/include\ -I$(top_srcdir)/library/include\ -DPREFIX=\""$(PREFIX)"\"\ -DDATADIRNAME=\""$(DATADIRNAME)"\"\ @@ -16,9 +16,9 @@ mabackup_LDADD=\ $(top_srcdir)/library/source/libadmin.a\ - $(top_srcdir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\ - $(top_srcdir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\ - $(top_srcdir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\ + $(top_srcdir)/../common/library/base-library/source/.libs/libmysqlx.a\ + $(top_srcdir)/../common/library/utilities/source/.libs/libguiutil.a\ + $(top_srcdir)/../common/library/sql-parser/source/.libs/libsqlparser.a\ @MYSQL_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/administrator/testing/test-application/Makefile mysql-gui-tools-5.0r14/administrator/testing/test-application/Makefile --- mysql-gui-tools-5.0r14-bak/administrator/testing/test-application/Makefile 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/administrator/testing/test-application/Makefile 2008-12-19 11:26:02.000000000 +0100 @@ -2,7 +2,7 @@ TEST_TIMEOUT=120000 -GCDIR=../../../mysql-gui-common/ +GCDIR=../../../common/ TUT_INCLUDES=-I$(GCDIR)/library/testing/include/ diff -Naru mysql-gui-tools-5.0r14-bak/common/extract_pot.sh mysql-gui-tools-5.0r14/common/extract_pot.sh --- mysql-gui-tools-5.0r14-bak/common/extract_pot.sh 2008-12-18 17:48:15.000000000 +0100 +++ mysql-gui-tools-5.0r14/common/extract_pot.sh 2008-12-19 11:25:29.000000000 +0100 @@ -2,7 +2,7 @@ FILES="glade_files.c source/linux/*c library/source/*c" -python ../mysql-gui-common/tools/po_glade.py res/linux/*.glade > glade_files.c +python ../common/tools/po_glade.py res/linux/*.glade > glade_files.c xgettext --default-domain=mysql-gui-common\ --add-comments --keyword=_ --keyword=N_ $FILES \ diff -Naru mysql-gui-tools-5.0r14-bak/migration-tool/build_mt_script.sh mysql-gui-tools-5.0r14/migration-tool/build_mt_script.sh --- mysql-gui-tools-5.0r14-bak/migration-tool/build_mt_script.sh 2008-12-18 17:48:14.000000000 +0100 +++ mysql-gui-tools-5.0r14/migration-tool/build_mt_script.sh 2008-12-19 11:24:32.000000000 +0100 @@ -34,22 +34,22 @@ mkdir -p java/lib mv ../mysql-grt-java-1.0.0-bin.jar java/lib -cp ../../mysql-gui-common/res/java/*jar java/lib +cp ../../common/res/java/*jar java/lib mkdir -p java/com/mysql/grt/modules/ -cp ../../mysql-gui-common/source/java/com/mysql/grt/modules/*java java/com/mysql/grt/modules/ -#cp ../../mysql-gui-common/source/java/com/mysql/grt/modules/*java java/com/mysql/grt/modules +cp ../../common/source/java/com/mysql/grt/modules/*java java/com/mysql/grt/modules/ +#cp ../../common/source/java/com/mysql/grt/modules/*java java/com/mysql/grt/modules (cd java; javac -g:none -nowarn -classpath .:lib:lib/junit.jar:lib/mysql-grt-java-1.0.0-bin.jar com/mysql/grt/modules/*) mkdir xml -cp ../../mysql-gui-common/res/grt/*xml xml +cp ../../common/res/grt/*xml xml cp ../res/grt/*xml xml mkdir scripts cp ../source/scripts/*lua scripts mkdir lua -cp ../../mysql-gui-common/source/lua/* lua +cp ../../common/source/lua/* lua cp ../source/lua/*lua lua if test `uname -s` = Darwin; then @@ -59,10 +59,10 @@ libname=libmyx_grt_java.so tlibname=myx_grt_java.so fi -#make -C ../../mysql-gui-common/library/generic-runtime/source $libname -cp ../../mysql-gui-common/library/generic-runtime/source/.libs/$libname java/ +#make -C ../../common/library/generic-runtime/source $libname +cp ../../common/library/generic-runtime/source/.libs/$libname java/ if test $libname != $tlibname; then (cd java; ln -s $libname $tlibname); fi -cp ../../mysql-gui-common/tools/grtsh/grtsh . +cp ../../common/tools/grtsh/grtsh . cp ../README.script . cat <<EOF> run_migration_simple diff -Naru mysql-gui-tools-5.0r14-bak/migration-tool/make_grtjar.sh mysql-gui-tools-5.0r14/migration-tool/make_grtjar.sh --- mysql-gui-tools-5.0r14-bak/migration-tool/make_grtjar.sh 2008-12-18 17:48:14.000000000 +0100 +++ mysql-gui-tools-5.0r14/migration-tool/make_grtjar.sh 2008-12-19 11:24:32.000000000 +0100 @@ -1,6 +1,6 @@ mtroot=./ -mcroot=../mysql-gui-common +mcroot=../common GRTSH=$mcroot/tools/grtsh/grtsh diff -Naru mysql-gui-tools-5.0r14-bak/migration-tool/setup/windows/source/mysql_migration_toolkit.xml mysql-gui-tools-5.0r14/migration-tool/setup/windows/source/mysql_migration_toolkit.xml --- mysql-gui-tools-5.0r14-bak/migration-tool/setup/windows/source/mysql_migration_toolkit.xml 2008-12-18 17:48:14.000000000 +0100 +++ mysql-gui-tools-5.0r14/migration-tool/setup/windows/source/mysql_migration_toolkit.xml 2008-12-19 11:24:32.000000000 +0100 @@ -113,7 +113,7 @@ Include UI --> - <?include ../../../mysql-gui-common/setup/windows/mysql_common_ui.inc ?> + <?include ../../../common/setup/windows/mysql_common_ui.inc ?> <!-- ***************************************************************************************** Properties @@ -195,22 +195,22 @@ <Binary Id="AdminBackground" src="resources/AdminBackground.jpg" /> <Binary Id="AdminHeader" src="resources/AdminHeader.jpg" /> - <Binary Id="NewBinary2" src="../../../mysql-gui-common/setup/windows/resources/binary/binary2" /> - <Binary Id="NewBinary3" src="../../../mysql-gui-common/setup/windows/resources/binary/binary3" /> - <Binary Id="NewBinary4" src="../../../mysql-gui-common/setup/windows/resources/binary/binary4" /> - <Binary Id="NewBinary5" src="../../../mysql-gui-common/setup/windows/resources/binary/binary5" /> - <Binary Id="NewBinary6" src="../../../mysql-gui-common/setup/windows/resources/binary/binary6" /> - <Binary Id="NewBinary7" src="../../../mysql-gui-common/setup/windows/resources/binary/binary7" /> - <Binary Id="NewBinary8" src="../../../mysql-gui-common/setup/windows/resources/binary/binary8" /> - <Binary Id="NewBinary9" src="../../../mysql-gui-common/setup/windows/resources/binary/binary9" /> - <Binary Id="NewBinary10" src="../../../mysql-gui-common/setup/windows/resources/binary/binary10" /> - <Binary Id="NewBinary11" src="../../../mysql-gui-common/setup/windows/resources/binary/binary11" /> - <Binary Id="NewBinary12" src="../../../mysql-gui-common/setup/windows/resources/binary/binary12" /> - <Binary Id="NewBinary13" src="../../../mysql-gui-common/setup/windows/resources/binary/binary13" /> - <Binary Id="NewBinary14" src="../../../mysql-gui-common/setup/windows/resources/binary/binary14" /> - <Binary Id="NewBinary15" src="../../../mysql-gui-common/setup/windows/resources/binary/binary15" /> - <Binary Id="NewBinary16" src="../../../mysql-gui-common/setup/windows/resources/binary/binary16" /> - <Binary Id="NewBinary17" src="../../../mysql-gui-common/setup/windows/resources/binary/binary17" /> - <Binary Id="NewBinary18" src="../../../mysql-gui-common/setup/windows/resources/binary/binary18" /> + <Binary Id="NewBinary2" src="../../../common/setup/windows/resources/binary/binary2" /> + <Binary Id="NewBinary3" src="../../../common/setup/windows/resources/binary/binary3" /> + <Binary Id="NewBinary4" src="../../../common/setup/windows/resources/binary/binary4" /> + <Binary Id="NewBinary5" src="../../../common/setup/windows/resources/binary/binary5" /> + <Binary Id="NewBinary6" src="../../../common/setup/windows/resources/binary/binary6" /> + <Binary Id="NewBinary7" src="../../../common/setup/windows/resources/binary/binary7" /> + <Binary Id="NewBinary8" src="../../../common/setup/windows/resources/binary/binary8" /> + <Binary Id="NewBinary9" src="../../../common/setup/windows/resources/binary/binary9" /> + <Binary Id="NewBinary10" src="../../../common/setup/windows/resources/binary/binary10" /> + <Binary Id="NewBinary11" src="../../../common/setup/windows/resources/binary/binary11" /> + <Binary Id="NewBinary12" src="../../../common/setup/windows/resources/binary/binary12" /> + <Binary Id="NewBinary13" src="../../../common/setup/windows/resources/binary/binary13" /> + <Binary Id="NewBinary14" src="../../../common/setup/windows/resources/binary/binary14" /> + <Binary Id="NewBinary15" src="../../../common/setup/windows/resources/binary/binary15" /> + <Binary Id="NewBinary16" src="../../../common/setup/windows/resources/binary/binary16" /> + <Binary Id="NewBinary17" src="../../../common/setup/windows/resources/binary/binary17" /> + <Binary Id="NewBinary18" src="../../../common/setup/windows/resources/binary/binary18" /> </Product> </Wix> diff -Naru mysql-gui-tools-5.0r14-bak/migration-tool/source/agent/Makefile mysql-gui-tools-5.0r14/migration-tool/source/agent/Makefile --- mysql-gui-tools-5.0r14-bak/migration-tool/source/agent/Makefile 2008-12-18 17:48:14.000000000 +0100 +++ mysql-gui-tools-5.0r14/migration-tool/source/agent/Makefile 2008-12-19 11:24:32.000000000 +0100 @@ -1,10 +1,10 @@ INCLUDES=`pkg-config glib-2.0 --cflags` `mysql_config --cflags` `pcre-config --cflags`\ - -I../../../mysql-gui-common/library_grt/include -I../../../mysql-gui-common/library/include + -I../../../common/library_grt/include -I../../../common/library/include -LIBS= -L../../../mysql-gui-common/library_grt/source -lgrt\ - -L../../../mysql-gui-common/library/source -lmysqlx\ +LIBS= -L../../../common/library_grt/source -lgrt\ + -L../../../common/library/source -lmysqlx\ `pcre-config --libs`\ `pkg-config glib-2.0 libxml-2.0 --libs` -llualib -llua \ diff -Naru mysql-gui-tools-5.0r14-bak/migration-tool/source/linux/Makefile mysql-gui-tools-5.0r14/migration-tool/source/linux/Makefile --- mysql-gui-tools-5.0r14-bak/migration-tool/source/linux/Makefile 2008-12-18 17:48:14.000000000 +0100 +++ mysql-gui-tools-5.0r14/migration-tool/source/linux/Makefile 2008-12-19 11:24:32.000000000 +0100 @@ -5,15 +5,15 @@ JAVA_LIBS=-L/opt/j2sdk1.4.2_04/jre/lib/i386/server/ -ljvm LUA_LIBS=-llua -llualib CXXFLAGS=-Wall $(DEFINES) `pkg-config glib-2.0 libxml-2.0 libglade-2.0 gtkmm-2.4 --cflags`\ - -I../include -I../../../mysql-gui-common/library/include -ggdb\ - -I../../../mysql-gui-common/library/generic-runtime/include\ - -I../../../mysql-gui-common/library/base-library/include\ - -I../../../mysql-gui-common/source/linux\ + -I../include -I../../../common/library/include -ggdb\ + -I../../../common/library/generic-runtime/include\ + -I../../../common/library/base-library/include\ + -I../../../common/source/linux\ `mysql_config --cflags` `pcre-config --cflags` $(JAVA_CFLAGS) LIBS=`pkg-config glib-2.0 libxml-2.0 --libs` `mysql_config --libs`\ - -L../../../mysql-gui-common/library/source -lmysqlx\ - -L../../../mysql-gui-common/source/linux -lmacommongui\ + -L../../../common/library/source -lmysqlx\ + -L../../../common/source/linux -lmacommongui\ `pcre-config --libs`\ $(JAVA_LIBS) $(LUA_LIBS) @@ -25,7 +25,7 @@ mttest: mttest.o - $(CC) $^ -L../../../mysql-gui-common/library_grt/source -lgrt $(CFLAGS) $(LIBS) -o $@ + $(CC) $^ -L../../../common/library_grt/source -lgrt $(CFLAGS) $(LIBS) -o $@ clean: diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/configure.in mysql-gui-tools-5.0r14/query-browser/configure.in --- mysql-gui-tools-5.0r14-bak/query-browser/configure.in 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/configure.in 2008-12-19 11:25:54.000000000 +0100 @@ -17,11 +17,11 @@ # # internal libraries # -AC_CHECK_FILE(../mysql-gui-common/library/base-library/include, - [MYSQLA_INCLUDE='-I$(top_srcdir)/../mysql-gui-common/library/base-library/include -I$(top_srcdir)/../mysql-gui-common/source/linux'], +AC_CHECK_FILE(../common/library/base-library/include, + [MYSQLA_INCLUDE='-I$(top_srcdir)/../common/library/base-library/include -I$(top_srcdir)/../common/source/linux'], AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program])) -#AC_CHECK_FILE(../mysql-gui-common/source/linux/libqbcommongui.a, [], +#AC_CHECK_FILE(../common/source/linux/libqbcommongui.a, [], # AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program])) diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/source/Makefile.am mysql-gui-tools-5.0r14/query-browser/library/source/Makefile.am --- mysql-gui-tools-5.0r14-bak/query-browser/library/source/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/source/Makefile.am 2008-12-19 11:25:45.000000000 +0100 @@ -2,10 +2,10 @@ noinst_LIBRARIES = libqb.a INCLUDES= -I../include -I../public_interface/linux\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/base-library/include\ + -I$(top_srcdir)/../common/library/utilities/shared_include\ + -I$(top_srcdir)/../common/library/utilities/include\ @MYSQL_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ libqb_a_SOURCES=\ diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_analyze/Makefile.am mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/Makefile.am --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_analyze/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/Makefile.am 2008-12-19 11:25:47.000000000 +0100 @@ -2,12 +2,12 @@ noinst_PROGRAMS = test_query_analyze INCLUDES= -I../include -I../public_interface/linux\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/shared_include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/include\ + -I$(top_srcdir)/../common/library/shared_include\ @MYSQL_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ test_query_analyze_SOURCES= test_query_analyze.cpp -test_query_analyze_LDADD= $(top_srcdir)/../mysql-gui-common/library/source/libmysqlx.a\ +test_query_analyze_LDADD= $(top_srcdir)/../common/library/source/libmysqlx.a\ @MYSQL_LIBS@ @PCRE_LIBS@ @GNOME_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_analyze/test.sh mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.sh --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_analyze/test.sh 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.sh 2008-12-19 11:25:46.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -cp ../../../../mysql-gui-common/tests/common.sh ./test_linked.sh +cp ../../../../common/tests/common.sh ./test_linked.sh cat ./test_priv.sh >> ./test_linked.sh chmod +x ./test_linked.sh ./test_linked.sh $* diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_composition/Makefile.am mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/Makefile.am --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_composition/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/Makefile.am 2008-12-19 11:25:49.000000000 +0100 @@ -2,12 +2,12 @@ noinst_PROGRAMS = test_query_composition INCLUDES= -I../include -I../public_interface/linux\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/shared_include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/include\ + -I$(top_srcdir)/../common/library/shared_include\ @MYSQL_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ test_query_composition_SOURCES= test_query_composition.cpp -test_query_composition_LDADD= $(top_srcdir)/../mysql-gui-common/library/source/libmysqlx.a\ +test_query_composition_LDADD= $(top_srcdir)/../common/library/source/libmysqlx.a\ @MYSQL_LIBS@ @PCRE_LIBS@ @GNOME_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_composition/test.sh mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.sh --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_query_composition/test.sh 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.sh 2008-12-19 11:25:47.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -cp ../../../../mysql-gui-common/tests/common.sh ./test_linked.sh +cp ../../../../common/tests/common.sh ./test_linked.sh cat ./test_priv.sh >> ./test_linked.sh chmod +x ./test_linked.sh ./test_linked.sh $* diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_strip_sql/Makefile.am mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/Makefile.am --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_strip_sql/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/Makefile.am 2008-12-19 11:25:50.000000000 +0100 @@ -2,13 +2,13 @@ noinst_PROGRAMS = test_strip_sql INCLUDES= -I../../include -I../../public_interface/linux\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/shared_include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/include\ + -I$(top_srcdir)/../common/library/shared_include\ @MYSQL_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ test_strip_sql_SOURCES= test_strip_sql.cpp test_strip_sql_LDADD= $(top_srcdir)/../mysql-query-browser/library/source/libqb.a\ - $(top_srcdir)/../mysql-gui-common/library/source/libmysqlx.a\ + $(top_srcdir)/../common/library/source/libmysqlx.a\ @MYSQL_LIBS@ @PCRE_LIBS@ @GNOME_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_strip_sql/test.sh mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.sh --- mysql-gui-tools-5.0r14-bak/query-browser/library/tests/test_strip_sql/test.sh 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.sh 2008-12-19 11:25:49.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -cp ../../../../mysql-gui-common/tests/common.sh ./test_linked.sh +cp ../../../../common/tests/common.sh ./test_linked.sh cat ./test_priv.sh >> ./test_linked.sh chmod +x ./test_linked.sh ./test_linked.sh $* diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/mysql-query-browser.spec.in mysql-gui-tools-5.0r14/query-browser/mysql-query-browser.spec.in --- mysql-gui-tools-5.0r14-bak/query-browser/mysql-query-browser.spec.in 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/mysql-query-browser.spec.in 2008-12-19 11:25:50.000000000 +0100 @@ -35,7 +35,7 @@ %build # first we have to build the common libs -cd ../mysql-gui-common +cd ../common %configure --with-commondirname=query-browser make %{?_smp_mflags} @@ -47,7 +47,7 @@ %install rm -rf %{buildroot} -cd ../mysql-gui-common +cd ../common make DESTDIR=%{buildroot} install cd ../%{name} diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/po/update.sh mysql-gui-tools-5.0r14/query-browser/po/update.sh --- mysql-gui-tools-5.0r14-bak/query-browser/po/update.sh 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/po/update.sh 2008-12-19 11:25:54.000000000 +0100 @@ -5,7 +5,7 @@ tr -d \\r < $template > tmp mv tmp $template -python ../../mysql-gui-common/tools/glade2po.py ../res/linux/*.glade --except-from=$template > glade.pot +python ../../common/tools/glade2po.py ../res/linux/*.glade --except-from=$template > glade.pot msgcat -s -o new.pot glade.pot $template mv -f new.pot $template pofiles=`/bin/ls -1 *.po|grep -v template` diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/setup/windows/source/mysql_query_browser.xml mysql-gui-tools-5.0r14/query-browser/setup/windows/source/mysql_query_browser.xml --- mysql-gui-tools-5.0r14-bak/query-browser/setup/windows/source/mysql_query_browser.xml 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/setup/windows/source/mysql_query_browser.xml 2008-12-19 11:25:50.000000000 +0100 @@ -105,7 +105,7 @@ Include UI --> - <?include ../../../mysql-gui-common/setup/windows/mysql_common_ui.inc ?> + <?include ../../../common/setup/windows/mysql_common_ui.inc ?> <!-- ***************************************************************************************** Properties @@ -185,22 +185,22 @@ <Binary Id="AdminBackground" src="resources/AdminBackground.jpg" /> <Binary Id="AdminHeader" src="resources/AdminHeader.jpg" /> - <Binary Id="NewBinary2" src="../../../mysql-gui-common/setup/windows/resources/binary/binary2" /> - <Binary Id="NewBinary3" src="../../../mysql-gui-common/setup/windows/resources/binary/binary3" /> - <Binary Id="NewBinary4" src="../../../mysql-gui-common/setup/windows/resources/binary/binary4" /> - <Binary Id="NewBinary5" src="../../../mysql-gui-common/setup/windows/resources/binary/binary5" /> - <Binary Id="NewBinary6" src="../../../mysql-gui-common/setup/windows/resources/binary/binary6" /> - <Binary Id="NewBinary7" src="../../../mysql-gui-common/setup/windows/resources/binary/binary7" /> - <Binary Id="NewBinary8" src="../../../mysql-gui-common/setup/windows/resources/binary/binary8" /> - <Binary Id="NewBinary9" src="../../../mysql-gui-common/setup/windows/resources/binary/binary9" /> - <Binary Id="NewBinary10" src="../../../mysql-gui-common/setup/windows/resources/binary/binary10" /> - <Binary Id="NewBinary11" src="../../../mysql-gui-common/setup/windows/resources/binary/binary11" /> - <Binary Id="NewBinary12" src="../../../mysql-gui-common/setup/windows/resources/binary/binary12" /> - <Binary Id="NewBinary13" src="../../../mysql-gui-common/setup/windows/resources/binary/binary13" /> - <Binary Id="NewBinary14" src="../../../mysql-gui-common/setup/windows/resources/binary/binary14" /> - <Binary Id="NewBinary15" src="../../../mysql-gui-common/setup/windows/resources/binary/binary15" /> - <Binary Id="NewBinary16" src="../../../mysql-gui-common/setup/windows/resources/binary/binary16" /> - <Binary Id="NewBinary17" src="../../../mysql-gui-common/setup/windows/resources/binary/binary17" /> - <Binary Id="NewBinary18" src="../../../mysql-gui-common/setup/windows/resources/binary/binary18" /> + <Binary Id="NewBinary2" src="../../../common/setup/windows/resources/binary/binary2" /> + <Binary Id="NewBinary3" src="../../../common/setup/windows/resources/binary/binary3" /> + <Binary Id="NewBinary4" src="../../../common/setup/windows/resources/binary/binary4" /> + <Binary Id="NewBinary5" src="../../../common/setup/windows/resources/binary/binary5" /> + <Binary Id="NewBinary6" src="../../../common/setup/windows/resources/binary/binary6" /> + <Binary Id="NewBinary7" src="../../../common/setup/windows/resources/binary/binary7" /> + <Binary Id="NewBinary8" src="../../../common/setup/windows/resources/binary/binary8" /> + <Binary Id="NewBinary9" src="../../../common/setup/windows/resources/binary/binary9" /> + <Binary Id="NewBinary10" src="../../../common/setup/windows/resources/binary/binary10" /> + <Binary Id="NewBinary11" src="../../../common/setup/windows/resources/binary/binary11" /> + <Binary Id="NewBinary12" src="../../../common/setup/windows/resources/binary/binary12" /> + <Binary Id="NewBinary13" src="../../../common/setup/windows/resources/binary/binary13" /> + <Binary Id="NewBinary14" src="../../../common/setup/windows/resources/binary/binary14" /> + <Binary Id="NewBinary15" src="../../../common/setup/windows/resources/binary/binary15" /> + <Binary Id="NewBinary16" src="../../../common/setup/windows/resources/binary/binary16" /> + <Binary Id="NewBinary17" src="../../../common/setup/windows/resources/binary/binary17" /> + <Binary Id="NewBinary18" src="../../../common/setup/windows/resources/binary/binary18" /> </Product> </Wix> diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/source/linux/Makefile.am mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am --- mysql-gui-tools-5.0r14-bak/query-browser/source/linux/Makefile.am 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am 2008-12-19 11:25:44.000000000 +0100 @@ -35,10 +35,10 @@ INCLUDES=@GNOME_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\ - -I$(top_srcdir)/../mysql-gui-common/source/linux\ - -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\ - -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\ + -I$(top_srcdir)/../common/source/linux\ + -I$(top_srcdir)/../common/library/base-library/include\ + -I$(top_srcdir)/../common/library/utilities/shared_include\ + -I$(top_srcdir)/../common/library/utilities/include\ -I$(top_srcdir)/library/include\ -I$(top_srcdir)/source/linux/gtksourceview\ -DPREFIX=\""$(PREFIX)"\"\ @@ -48,10 +48,10 @@ mysql_query_browser_bin_LDADD=$(top_builddir)/library/source/libqb.a\ - $(top_builddir)/../mysql-gui-common/source/linux/libqbcommongui.a\ - $(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\ - $(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\ - $(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\ + $(top_builddir)/../common/source/linux/libqbcommongui.a\ + $(top_builddir)/../common/library/base-library/source/.libs/libmysqlx.a\ + $(top_builddir)/../common/library/utilities/source/.libs/libguiutil.a\ + $(top_builddir)/../common/library/sql-parser/source/.libs/libsqlparser.a\ $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\ @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ diff -Naru mysql-gui-tools-5.0r14-bak/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj --- mysql-gui-tools-5.0r14-bak/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj 2008-12-18 17:48:16.000000000 +0100 +++ mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj 2008-12-19 11:25:44.000000000 +0100 @@ -331,7 +331,7 @@ 2B8FA936082A73F900D63986 /* sbar_unsplitv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sbar_unsplitv.png; path = ../../images/png/sbar_unsplitv.png; sourceTree = SOURCE_ROOT; }; 2B8FB08E082D704100D63986 /* MQRSSearchPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MQRSSearchPanel.h; sourceTree = "<group>"; }; 2B8FB08F082D704100D63986 /* MQRSSearchPanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MQRSSearchPanel.m; sourceTree = "<group>"; }; - 2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../mysql-gui-common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; }; + 2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; }; 2B8FB4EB0830EEDE00D63986 /* tabsheet_icon_inlinehelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_inlinehelp.png; path = ../../images/png/tabsheet_icon_inlinehelp.png; sourceTree = SOURCE_ROOT; }; 2B8FB4EC0830EEDE00D63986 /* tabsheet_icon_resultset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_resultset.png; path = ../../images/png/tabsheet_icon_resultset.png; sourceTree = SOURCE_ROOT; }; 2B8FB4ED0830EEDE00D63986 /* tabsheet_icon_script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_script.png; path = ../../images/png/tabsheet_icon_script.png; sourceTree = SOURCE_ROOT; }; @@ -353,8 +353,8 @@ 2B8FB83708342EB000D63986 /* rs_search_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search_disabled.png; path = ../../images/png/rs_search_disabled.png; sourceTree = SOURCE_ROOT; }; 2B8FB83808342EB000D63986 /* rs_search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search.png; path = ../../images/png/rs_search.png; sourceTree = SOURCE_ROOT; }; 2B8FB83908342EB000D63986 /* rs_warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_warning.png; path = ../../images/png/rs_warning.png; sourceTree = SOURCE_ROOT; }; - 2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../mysql-gui-common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; }; - 2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../mysql-gui-common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; }; + 2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; }; + 2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; }; 2B9973360A64A03E00649D58 /* libintl.3.4.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.3.4.3.dylib; path = /Users/vlad/sw/lib/libintl.3.4.3.dylib; sourceTree = "<absolute>"; }; 2B9973BC0A64AF0200649D58 /* libglib-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libglib-2.0.0.dylib"; path = "/uni/lib/libglib-2.0.0.dylib"; sourceTree = "<absolute>"; }; 2B9C8E710853B05900C16483 /* MQHelpTab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQHelpTab.h; sourceTree = "<group>"; }; @@ -402,11 +402,11 @@ 2BC7D7E807F47A7100CB83E9 /* MQBookmark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQBookmark.m; sourceTree = "<group>"; }; 2BC9F969085F7A6F00949574 /* MQPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQPreferences.h; sourceTree = "<group>"; }; 2BC9F96A085F7A6F00949574 /* MQPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQPreferences.m; sourceTree = "<group>"; }; - 2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../mysql-gui-common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; }; - 2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; }; - 2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; }; - 2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; }; - 2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; }; + 2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; }; + 2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; }; + 2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; }; + 2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; }; + 2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; }; 2BD9ABF4085E417E00DF65E9 /* mysqlqb_functions.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_functions.xml; path = ../../res/mysqlqb_functions.xml; sourceTree = SOURCE_ROOT; }; 2BD9ABF5085E417E00DF65E9 /* mysqlqb_statements.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_statements.xml; path = ../../res/mysqlqb_statements.xml; sourceTree = SOURCE_ROOT; }; 2BD9AD7C085E701400DF65E9 /* mysqlqb_functions.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; name = mysqlqb_functions.html; path = ../../res/doc/mysqlqb_functions.html; sourceTree = SOURCE_ROOT; };
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor