Skip to content

Commit

Permalink
Merge branch 'release/2.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
artbear committed Aug 10, 2018
2 parents 2beab1c + 445ab5a commit 8461f7a
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 70 deletions.
129 changes: 65 additions & 64 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,64 +1,65 @@
*.lgp
*.lgf
tests/testSrc/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

*.ospx
*.lgp
*.lgf
tests/testSrc/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

*.ospx
oscript_modules/
9 changes: 5 additions & 4 deletions packagedef
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@

Описание.Имя("precommit1c")
.Версия("2.1.1")
.Версия("2.1.2")
.ЗависитОт("asserts", "0.4.0")
.ЗависитОт("cmdline", "0.6.2")
.ЗависитОт("logos", "0.6.2")
.ЗависитОт("cmdline", "1.0.0")
.ЗависитОт("logos", "1.1.1")
.ЗависитОт("strings", "0.4.1")
.ЗависитОт("tempfiles", "0.2.2")
.ЗависитОт("v8runner", "0.13.0")
.ЗависитОт("v8runner", "1.1.3")
.ЗависитОт("1commands", "1.3.5")
.ИсполняемыйФайл("v8files-extractor.os");

ФайлыКаталога = НайтиФайлы(ТекущийСценарий().Каталог, ПолучитьМаскуВсеФайлы());
Expand Down
4 changes: 2 additions & 2 deletions v8files-extractor.os
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@

КонецПроцедуры

Функция Компилировать(Знач Путь, Знач КаталогВыгрузки, Знач Рекурсивно = Ложь) Экспорт
Процедура Компилировать(Знач Путь, Знач КаталогВыгрузки, Знач Рекурсивно = Ложь) Экспорт

ПутьКИсходникам = ОбъединитьПути(ТекущийКаталог(), Путь);

Expand All @@ -614,7 +614,7 @@
СобратьФайл(ПутьКИсходникам, КаталогВыгрузки);
КонецЕсли;

КонецФункции
КонецПроцедуры

Процедура СобратьКаталог(Знач ПутьКИсходникам, КаталогВыгрузки)

Expand Down

0 comments on commit 8461f7a

Please sign in to comment.