From 705df4a4b6de9d6b6953bd429f78c51d782b1163 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Thu, 21 Apr 2016 20:12:40 +0300 Subject: [PATCH 01/10] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=B1=D0=BE=D1=80=D1=89=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=B0=D1=80=D1=85=D0=B8=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.os | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 build.os diff --git a/build.os b/build.os new file mode 100644 index 0000000..68e869b --- /dev/null +++ b/build.os @@ -0,0 +1,79 @@ +#Использовать logos + +Перем Лог; +Перем КаталогСборки; + +Процедура Инициализация() + + Лог = Логирование.ПолучитьЛог("precommit1c.app.build"); + Лог.УстановитьУровень(УровниЛога.Информация); + + КаталогСборки = ОбъединитьПути(ТекущийКаталог(), "build"); + + ОбеспечитьПустойКаталог(КаталогСборки); + +КонецПроцедуры + +Функция ОбернутьВКавычки(Знач Строка) + Возврат """" + Строка + """"; +КонецФункции + +Процедура ВыполнитьКоманду(Знач КомандаЗапуска, Знач ТекстОшибки = "", Знач РабочийКаталог = "") + + Лог.Информация("Выполняю команду: " + КомандаЗапуска); + + Процесс = СоздатьПроцесс("cmd.exe /C " + ОбернутьВКавычки(КомандаЗапуска), РабочийКаталог, Истина, , КодировкаТекста.UTF8); + Процесс.Запустить(); + + Процесс.ОжидатьЗавершения(); + + Пока НЕ Процесс.Завершен ИЛИ Процесс.ПотокВывода.ЕстьДанные Цикл + СтрокаВывода = Процесс.ПотокВывода.ПрочитатьСтроку(); + Сообщить(СтрокаВывода); + КонецЦикла; + + Если Процесс.КодВозврата <> 0 Тогда + Лог.Ошибка("Код возврата: " + Процесс.КодВозврата); + ВызватьИсключение ТекстОшибки + Символы.ПС + Процесс.ПотокОшибок.Прочитать(); + КонецЕсли; + +КонецПроцедуры + +Процедура ОбеспечитьПустойКаталог(Знач ПутьККаталогу) + + ФайлОбъектКаталога = Новый Файл(ПутьККаталогу); + + Если ФайлОбъектКаталога.Существует() Тогда + Лог.Отладка("Очищаем каталог " + ФайлОбъектКаталога.ПолноеИмя); + УдалитьФайлы(ФайлОбъектКаталога.ПолноеИмя, ПолучитьМаскуВсеФайлы()); + КонецЕсли; + + Лог.Отладка("Создаем новый каталог " + ФайлОбъектКаталога.ПолноеИмя); + СоздатьКаталог(ФайлОбъектКаталога.ПолноеИмя); + +КонецПроцедуры + +Процедура ДобавитьФайлВАрхив(Архив, ПутьКФайлу) + Лог.Информация("Добавляем в архив файл/каталог <" + ПутьКФайлу + ">"); + Архив.Добавить("./" + ПутьКФайлу, РежимСохраненияПутейZIP.СохранятьОтносительныеПути); +КонецПроцедуры + +Процедура ВыполнитьСкрипт() + + Лог.Информация("Инициализация подмодуля v8reader"); + ВыполнитьКоманду("git submodule update --init --recursive"); + + Архив = Новый ЗаписьZipФайла(); + Архив.Открыть(ОбъединитьПути(КаталогСборки, "precommit1c.zip")); + ДобавитьФайлВАрхив(Архив, "pre-commit"); + ДобавитьФайлВАрхив(Архив, "v8files-extractor.os"); + ДобавитьФайлВАрхив(Архив, "ibService"); + ДобавитьФайлВАрхив(Архив, "tools"); + ДобавитьФайлВАрхив(Архив, "v8Reader"); + + Архив.Записать(); + +КонецПроцедуры + +Инициализация(); +ВыполнитьСкрипт(); From 2bf3a86dfa034a9961da8aa310fbb95df2201216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=83=D1=80=20=D0=90=D1=8E=D1=85=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=20aka=20artbear?= Date: Thu, 21 Apr 2016 23:31:54 +0300 Subject: [PATCH 02/10] =?UTF-8?q?=D0=92=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20git=20config=20--l?= =?UTF-8?q?ocal=20core.quotepath=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D1=8F=D1=8E=20=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20=D0=BD=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B1=D0=B5=D0=B7=20=D1=83?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B0=20=D0=B2=D0=B8=D0=B4=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20git=20config=20core.quotepath=20fix=20#82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index 0332a2c..3127463 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -356,7 +356,7 @@ Процедура ПроверитьНастройкиРепозитарияГит() Экспорт Перем КодВозврата; - КомандаПроверкаСостояния = "git config --local core.quotepath"; + КомандаПроверкаСостояния = "git config core.quotepath"; Лог.Отладка("Выполняю команду "+КомандаПроверкаСостояния); Вывод = ПолучитьВыводПроцесса(КомандаПроверкаСостояния, КодВозврата); @@ -367,8 +367,10 @@ Возврат; КонецЕсли; - ВызватьИсключение "У репозитария не заданы необходимые настройки - |Выполните команду git config --local core.quotepath false"; + ВызватьИсключение "У текущего репозитария не заданы необходимые настройки! + |Выполните команду git config --local core.quotepath false + | + |А еще лучше сделать глобальную настройку git config --global core.quotepath false"; КонецПроцедуры From 628c903819a9357753fcb282f284b2a7f8885429 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Wed, 27 Jan 2016 10:56:32 +0300 Subject: [PATCH 03/10] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=B8=D1=86=D0=B5=D0=BD=D0=B7=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.md | 194 +++++++++++++++++++++++++++++++++++++++++++ NOTICE | 22 +++++ README.md | 4 + v8files-extractor.os | 16 +++- 4 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 LICENSE.md create mode 100644 NOTICE diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..98a6f96 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,194 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..3818854 --- /dev/null +++ b/NOTICE @@ -0,0 +1,22 @@ +Copyright 2016 xDrivenDevelopment + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +------------------------------------------------------------------------------- + +This product contains V8Reader, which is licensed under the Apache License, +Version 2.0. +The license can be downloaded from +http://www.apache.org/licenses/LICENSE-2.0.html. +The source code for this software is available from +https://github.com/xDrivenDevelopment/v8reader. diff --git a/README.md b/README.md index 02143fd..2dc265c 100644 --- a/README.md +++ b/README.md @@ -75,3 +75,7 @@ oscript v8files-extractor.os ? ## Что внутри Как это работает: v8files-extractor.os полностью повторяет иерархию папок относительно корня репозитория только в папке SRC (от слова source), для каждой изменённой внешней обработки создаётся своя папка и туда с помощью v8unpack распаковывается помещаемая обработка, с помощью v8reader определяются наименования макетов, форм, модуля обработки и переименовываются, переименования сохраняются в служебном файле renames.txt, те файлы, которые невозможно определить или же носят чисто служебный характер, переносятся в каталог *und* + +## Лицензия + +Лицензировано на условиях Apache License 2.0. Смотрите файл [LICENSE.md](LICENSE.md) в корневом каталоге репозитория. diff --git a/v8files-extractor.os b/v8files-extractor.os index 3127463..de9f4a9 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -1,4 +1,18 @@ -#Использовать cmdline +// Copyright 2016 xDrivenDevelopment +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#Использовать cmdline #Использовать logos #Использовать tempfiles #Использовать asserts From ffda798b92c75aaab66d5db307673c7daca6072a Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Tue, 26 Apr 2016 11:50:05 +0300 Subject: [PATCH 04/10] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=20=D1=81=D0=B1=D0=BE=D1=80=D1=89=D0=B8?= =?UTF-8?q?=D0=BA=20=D0=B2=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20?= =?UTF-8?q?scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.os => scripts/build.os | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build.os => scripts/build.os (100%) diff --git a/build.os b/scripts/build.os similarity index 100% rename from build.os rename to scripts/build.os From fc5f22a476e00b04b4ed176c640a145f38e527dd Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Wed, 11 May 2016 23:37:09 +0300 Subject: [PATCH 05/10] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=BF=D0=BE=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B5=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20zip-?= =?UTF-8?q?=D0=B0=D1=80=D1=85=D0=B8=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 02143fd..2f338c6 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,39 @@ * в случае запуска из под wine необходим msscriptcontrol * Библиотеки [oscript-library]( https://github.com/EvilBeaver/oscript-library) -2. По умолчанию считается, что пути к oscript.exe и git.exe находятся в переменной path, иначе необходимо указать явный путь в файлах pre-commit +2. По умолчанию считается, что пути к oscript.exe и git.exe находятся в переменной path, иначе необходимо указать явный путь в файле pre-commit -3. После клонирования данного репозитория необходимо инициализировать используемые подмодули. +3. Путь хранения исходных текстов разобранных обработок по умолчанию используется как **src** (для обеспечения совместимости со старыми версиями обработки), однако его можно переназначить в файле `pre-commit` + +#### Установка через zip-архив + +1. Скачайте zip-архив precommit1c.zip со страницы [последнего релиза](https://github.com/xDrivenDevelopment/precommit1c/releases/latest). + +2. Содержмое архива необходимо разархивировать в каталог .git/hooks/ вашего проекта. +*Примечание:* каталог .git по умолчанию скрыт. +В итоге у вас должна получиться следующая структура каталога: +``` +.git\ + hooks\ + pre-commit + V8Reader + tools + ibService + v8files-extractor.os +``` + +#### Установка через git clone + +1. Склонируйте репозиторий `precommit1c` в удобное место. + +2. После клонирования репозитория необходимо инициализировать используемые подмодули. Откройте командую строку и выполните команды: ```cmd cd путь/к/репозиторию/precommit1c git submodule update --init --recursive ``` -4. Cодержимое каталога необходимо скопировать в каталог .git/hooks/ вашего проекта. +3. Cодержимое каталога необходимо скопировать в каталог .git/hooks/ вашего проекта. *Примечание:* каталог .git по умолчанию скрыт. В итоге у вас должна получиться следующая структура каталога: ``` @@ -40,8 +63,6 @@ git submodule update --init --recursive v8files-extractor.os ``` -5. Путь хранения исходных текстов разобранных обработок по умолчанию используется как **src** (для обеспечения совместимости со старыми версиями обработки), однако его можно переназначить в файле `pre-commit` - ## Запуск После установки достаточно для проверки сделать commit для любого файла epf/erf, и в вашем репозитории автоматически должна создаться папка *src*, полностью повторяющая структуру проекта, изменённые или добавленные файлы распакуются в папки с аналогичными наименованиями. From 98e1d2c592a18472b84690fe733a628e869d1f53 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 23 May 2016 13:07:36 +0300 Subject: [PATCH 06/10] =?UTF-8?q?Fix=20#88.=20=D0=9A=D0=BE=D1=80=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=B0=D0=B2=D1=8B=D1=87=D0=B5?= =?UTF-8?q?=D0=BA=20=D0=B8=D0=B7=20=D0=BF=D1=83=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index de9f4a9..f8c244a 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -811,11 +811,11 @@ ОбработанныйПуть = Путь; - Если Лев(Путь, 1) = """" Тогда - ОбработанныйПуть = Прав(Путь, СтрДлина(Путь) - 1); + Если Лев(ОбработанныйПуть, 1) = """" Тогда + ОбработанныйПуть = Прав(ОбработанныйПуть, СтрДлина(ОбработанныйПуть) - 1); КонецЕсли; - Если Прав(Путь, 1) = """" Тогда - ОбработанныйПуть = Лев(Путь, СтрДлина(Путь) - 1); + Если Прав(ОбработанныйПуть, 1) = """" Тогда + ОбработанныйПуть = Лев(ОбработанныйПуть, СтрДлина(ОбработанныйПуть) - 1); КонецЕсли; Возврат ОбработанныйПуть; From ae78b2fb02a037657622627ff771aea75a737431 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 23 May 2016 13:13:13 +0300 Subject: [PATCH 07/10] =?UTF-8?q?Fix=20#86.=20=D0=A1=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=20=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B5=D0=BD=D0=BD=D0=BE=D0=BC=20v8reader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index f8c244a..274702b 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -273,7 +273,7 @@ ПутьV8Reader = ОбъединитьПути(ТекущийСценарий().Каталог, "v8Reader", "V8Reader.epf"); Лог.Отладка("Путь к V8Reader: " + ПутьV8Reader); - Ожидаем.Что(Новый Файл(ПутьV8Reader).Существует()).ЭтоИстина(); + Ожидаем.Что(Новый Файл(ПутьV8Reader).Существует(), "Некорректно установлен V8Reader. Не обранужен файл <" + ПутьV8Reader + ">").ЭтоИстина(); КоманднаяСтрокаV8Reader = СтрЗаменить("/C""decompile;pathtocf;%1;pathout;%2;convert-mxl2txt;ЗавершитьРаботуПосле;""","%1", Файл.ПолноеИмя); КоманднаяСтрокаV8Reader = СтрЗаменить(КоманднаяСтрокаV8Reader,"%2", ПапкаИсходников.ПолноеИмя); From bf5e4aa217eb0f17596c22c0b6e3be814ebee1e0 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 23 May 2016 14:10:54 +0300 Subject: [PATCH 08/10] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index 274702b..35f1902 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -273,7 +273,7 @@ ПутьV8Reader = ОбъединитьПути(ТекущийСценарий().Каталог, "v8Reader", "V8Reader.epf"); Лог.Отладка("Путь к V8Reader: " + ПутьV8Reader); - Ожидаем.Что(Новый Файл(ПутьV8Reader).Существует(), "Некорректно установлен V8Reader. Не обранужен файл <" + ПутьV8Reader + ">").ЭтоИстина(); + Ожидаем.Что(Новый Файл(ПутьV8Reader).Существует(), "Некорректно установлен V8Reader. Не обнаружен файл <" + ПутьV8Reader + ">").ЭтоИстина(); КоманднаяСтрокаV8Reader = СтрЗаменить("/C""decompile;pathtocf;%1;pathout;%2;convert-mxl2txt;ЗавершитьРаботуПосле;""","%1", Файл.ПолноеИмя); КоманднаяСтрокаV8Reader = СтрЗаменить(КоманднаяСтрокаV8Reader,"%2", ПапкаИсходников.ПолноеИмя); From ea72a805c061ca92a00050f4e58515ec1c96e93b Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 23 May 2016 14:11:08 +0300 Subject: [PATCH 09/10] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=20=D1=81=D0=B8=D0=BB=D1=83=20=D0=97?= =?UTF-8?q?=D0=BD=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index 35f1902..6409797 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -796,29 +796,26 @@ Функция ОбернутьПутьВКавычки(Знач Путь) - Результат = Путь; - Если Прав(Результат, 1) = "\" Тогда - Результат = Лев(Результат, СтрДлина(Результат) - 1); + Если Прав(Путь, 1) = "\" Тогда + Путь = Лев(Путь, СтрДлина(Путь) - 1); КонецЕсли; - Результат = """" + Результат + """"; + Путь = """" + Путь + """"; - Возврат Результат; + Возврат Путь; КонецФункции -Функция УбратьКавычкиВокругПути(Путь) +Функция УбратьКавычкиВокругПути(Знач Путь) - ОбработанныйПуть = Путь; - - Если Лев(ОбработанныйПуть, 1) = """" Тогда - ОбработанныйПуть = Прав(ОбработанныйПуть, СтрДлина(ОбработанныйПуть) - 1); + Если Лев(Путь, 1) = """" Тогда + Путь = Прав(Путь, СтрДлина(Путь) - 1); КонецЕсли; - Если Прав(ОбработанныйПуть, 1) = """" Тогда - ОбработанныйПуть = Лев(ОбработанныйПуть, СтрДлина(ОбработанныйПуть) - 1); + Если Прав(Путь, 1) = """" Тогда + Путь = Лев(Путь, СтрДлина(Путь) - 1); КонецЕсли; - Возврат ОбработанныйПуть; + Возврат Путь; КонецФункции From 872e24867d5544454176be947db750d7b7a30690 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 23 May 2016 14:20:11 +0300 Subject: [PATCH 10/10] =?UTF-8?q?=D0=91=D0=B0=D0=BC=D0=BF=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v8files-extractor.os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v8files-extractor.os b/v8files-extractor.os index 6409797..369497e 100644 --- a/v8files-extractor.os +++ b/v8files-extractor.os @@ -26,7 +26,7 @@ Функция Версия() Экспорт - Версия = "2.0.2"; + Версия = "2.0.3"; Возврат "v" + Версия;