RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:doctrine/doctrine2

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-08-27 17:59:11 +02:00
commit 7da9beed36
8 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.properties.dev
View File

@ -8,6 +8,7 @@ report.dir=reports
log.archive.dir=logs log.archive.dir=logs
project.pirum_dir= project.pirum_dir=
project.download_dir= project.download_dir=
project.xsd_dir=
test.phpunit_configuration_file= test.phpunit_configuration_file=
test.phpunit_generate_coverage=0 test.phpunit_generate_coverage=0
test.pmd_reports=0 test.pmd_reports=0

9
build.xml
View File

@ -223,7 +223,12 @@
<target name="distribute-download"> <target name="distribute-download">
<copy file="dist/DoctrineORM-${version}-full.tar.gz" todir="${project.download_dir}" /> <copy file="dist/DoctrineORM-${version}-full.tar.gz" todir="${project.download_dir}" />
<copy file="${dist.dir}/doctrine-orm-${version}.phar" todir="${project.download_dir}" /> <!--<copy file="${dist.dir}/doctrine-orm-${version}.phar" todir="${project.download_dir}" />-->
</target>
<target name="distribute-xsd">
<php expression="substr('${version}', 0, 3)" returnProperty="minorVersion" /><!-- not too robust -->
<copy file="${project.basedir}/doctrine-mapping.xsd" tofile="${project.xsd_dir}/doctrine-mapping-${minorVersion}.xsd" />
</target> </target>
<target name="update-dev-version"> <target name="update-dev-version">
@ -235,7 +240,7 @@
<exec command="git commit -m 'Bump Dev Version to ${next_version}-DEV'" passthru="true" /> <exec command="git commit -m 'Bump Dev Version to ${next_version}-DEV'" passthru="true" />
</target> </target>
<target name="release" depends="git-tag,build-packages,package-phar,distribute-download,pirum-release,update-dev-version" /> <target name="release" depends="git-tag,build-packages,distribute-download,pirum-release,update-dev-version,distribute-xsd" />
<!-- <!--
Builds distributable PEAR packages for the Symfony Dependencies Builds distributable PEAR packages for the Symfony Dependencies

2
lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
View File

@ -137,7 +137,7 @@ EOT
if ( ! file_exists($destPath)) { if ( ! file_exists($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
sprintf("Mapping destination directory '<info>%s</info>' does not exist.", $destPath) sprintf("Mapping destination directory '<info>%s</info>' does not exist.", $input->getArgument('dest-path'))
); );
} else if ( ! is_writable($destPath)) { } else if ( ! is_writable($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(

2
lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
View File

@ -123,7 +123,7 @@ EOT
if ( ! file_exists($destPath)) { if ( ! file_exists($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
sprintf("Entities destination directory '<info>%s</info>' does not exist.", $destPath) sprintf("Entities destination directory '<info>%s</info>' does not exist.", $input->getArgument('dest-path'))
); );
} else if ( ! is_writable($destPath)) { } else if ( ! is_writable($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(

2
lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
View File

@ -87,7 +87,7 @@ EOT
if ( ! file_exists($destPath)) { if ( ! file_exists($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
sprintf("Proxies destination directory '<info>%s</info>' does not exist.", $destPath) sprintf("Proxies destination directory '<info>%s</info>' does not exist.", $em->getConfiguration()->getProxyDir())
); );
} else if ( ! is_writable($destPath)) { } else if ( ! is_writable($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(

2
lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
View File

@ -79,7 +79,7 @@ EOT
if ( ! file_exists($destPath)) { if ( ! file_exists($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
sprintf("Entities destination directory '<info>%s</info>' does not exist.", $destPath) sprintf("Entities destination directory '<info>%s</info>' does not exist.", $input->getArgument('dest-path'))
); );
} else if ( ! is_writable($destPath)) { } else if ( ! is_writable($destPath)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit 74a2c924cd08b30785877808b1fb519b4b2e60b1 Subproject commit 174111c8d245d560e1af4c7455b730347f85686d

2
lib/vendor/doctrine-dbal vendored

@ -1 +1 @@
Subproject commit be3790059cc43b674a55548eb42d5d25846ea6a9 Subproject commit 54f474b3c321676ceadbe4288396902405d87756