From cc2e0497db405b203d8b8e9e1d1badab9f0fae7e Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 6 Jul 2020 23:08:05 -0400 Subject: [PATCH] [FIX] manifest guide discover --- doc/DEVELOPMENT.md | 13 ++++++++++++- doc/DISCOVER.md | 3 ++- env_var.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/DEVELOPMENT.md b/doc/DEVELOPMENT.md index 2e45e18..d0554d5 100644 --- a/doc/DEVELOPMENT.md +++ b/doc/DEVELOPMENT.md @@ -19,6 +19,17 @@ cd ERPLibre ./run.sh ``` +## Develop in Odoo repository +You need to remove +> clone-depth="1" + +from +> ./manifest/default.dev.xml + +file to be able to commit and push. +Commit temporary and regenerate with +> ./script/install_locally_dev.sh + ## Fork project to create a new project independent of ERPLibre (deprecated) ERPLibre was created by this script. It's now deprecated. Use this script when you need to fork directly from the original source. @@ -64,7 +75,7 @@ This will update all urls in git format: ## Diff repo with another project Tools to display the differences between the repo and another project. ```bash -./venv/bin/python ./script/list_repo_diff.py --sync_to /path/to/project/erplibre --dyr_sync +./venv/bin/python ./script/list_repo_diff.py --sync_to /path/to/project/erplibre --dry_sync ``` ## Sync repo with another project diff --git a/doc/DISCOVER.md b/doc/DISCOVER.md index 7a1fc0f..aa93a3b 100644 --- a/doc/DISCOVER.md +++ b/doc/DISCOVER.md @@ -25,7 +25,8 @@ Access to a new repo, add your URL to file [source_repo_addons.csv](../source_re Execute script: ```bash ./venv/bin/python ./script/git_repo_manifest.py -./script/install_locally_dev.sh +git checkout -b new_branch git commit -am "Add new repo" +./script/install_locally_dev.sh ``` [Update your repo.](./GIT_REPO.md) diff --git a/env_var.sh b/env_var.sh index d919be9..5c913df 100755 --- a/env_var.sh +++ b/env_var.sh @@ -19,5 +19,5 @@ EL_INSTALL_NGINX="True" # Set the website name EL_WEBSITE_NAME="_" EL_GITHUB_TOKEN="" -EL_MANIFEST_PROD="./manifest/default.xml" +EL_MANIFEST_PROD="./default.xml" EL_MANIFEST_DEV="./manifest/default.dev.xml"